Feature/skiasharp render v2 (#104)

* New alternative C64 SkiaSharp renderers (SkiaSharp2 and SkiaSharp2b) that supports bitmap modes. * Fixes #102 (C64 38 column mode scroll issue)
highbyte · Jul 16, 2024 · f2e0d39 · f2e0d39
1 parent aca5a98
commit f2e0d39
Show file tree

Hide file tree

Showing 41 changed files with 2,928 additions and 116 deletions.
diff --git a/samples/Basic/C64/Text/Build/MultiColorTextMode.prg b/samples/Basic/C64/Text/Build/MultiColorTextMode.prg
diff --git a/samples/Basic/C64/Text/MultiColorTextMode.txt b/samples/Basic/C64/Text/MultiColorTextMode.txt
@@ -0,0 +1,7 @@
+10 poke 53281,1
+20 poke 53282,2
+30 poke 53283,5
+40 poke 53284,6
+
+50 poke 53270,peek(53270) or 16
+print chr$(149)"this is multicolor mode"
diff --git a/samples/Basic/README_BUILD_BASIC_EXAMPLES.md b/samples/Basic/README_BUILD_BASIC_EXAMPLES.md
@@ -50,6 +50,12 @@ $PETCAT_APP = "C:\Users\highb\Documents\C64\VICE\bin\petcat.exe"
 cd C64/Text
 & $PETCAT_APP -w2 -o "Build\ExtendedTextMode.prg" -- "ExtendedTextMode.txt"
 ´´´
+´´´ pwsh
+$PETCAT_APP = "C:\Users\highb\Documents\C64\VICE\bin\petcat.exe"
+cd C64/Text
+& $PETCAT_APP -w2 -o "Build\MultiColorTextMode.prg" -- "MultiColorTextMode.txt"
+´´´
+
 
 ´´´ pwsh
 $PETCAT_APP = "C:\Users\highb\Documents\C64\VICE\bin\petcat.exe"

diff --git a/src/apps/Highbyte.DotNet6502.App.SilkNetNative/Program.cs b/src/apps/Highbyte.DotNet6502.App.SilkNetNative/Program.cs
@@ -32,7 +32,7 @@
 
 var c64HostConfig = new C64HostConfig
 {
-    Renderer = C64HostRenderer.SilkNetOpenGl,
+    Renderer = C64HostRenderer.SkiaSharp2b,
     SilkNetOpenGlRendererConfig = new C64SilkNetOpenGlRendererConfig()
     {
         UseFineScrollPerRasterLine = false, // Setting to true may work, depending on how code is written. Full screen scroll may not work (actual screen memory is not rendered in sync with raster line).

diff --git a/src/apps/Highbyte.DotNet6502.App.SilkNetNative/SilkNetWindow.cs b/src/apps/Highbyte.DotNet6502.App.SilkNetNative/SilkNetWindow.cs
@@ -305,8 +305,10 @@ public void Reset()
         if (EmulatorState == EmulatorState.Uninitialized)
             return;
 
-        Stop();
+        if (_statsPanel.Visible)
+            ToggleStatsPanel();
 
+        _systemRunner?.Cleanup();
         _systemRunner = default!;
         EmulatorState = EmulatorState.Uninitialized;
         Start();
@@ -320,6 +322,7 @@ public void Stop()
         if (_statsPanel.Visible)
             ToggleStatsPanel();
 
+        _systemRunner.Cleanup();
         _systemRunner = default!;
         SetUninitializedWindow();
         InitRendering();

diff --git a/src/apps/Highbyte.DotNet6502.App.SilkNetNative/SystemSetup/C64HostConfig.cs b/src/apps/Highbyte.DotNet6502.App.SilkNetNative/SystemSetup/C64HostConfig.cs
@@ -1,4 +1,4 @@
-using Highbyte.DotNet6502.Impl.SilkNet.Commodore64;
+using Highbyte.DotNet6502.Impl.SilkNet.Commodore64.Input;
 using Highbyte.DotNet6502.Impl.SilkNet.Commodore64.Video;
 using Highbyte.DotNet6502.Systems;
 
@@ -7,19 +7,21 @@ namespace Highbyte.DotNet6502.App.SilkNetNative.SystemSetup
     public enum C64HostRenderer
     {
         SkiaSharp,
+        SkiaSharp2,  // Experimental render directly to pixel buffer backed by a SKBitmap + Skia shader (SKSL)
+        SkiaSharp2b, // Experimental render after each instruction directly to pixel buffer backed by a SKBitmap + Skia shader (SKSL)
         SilkNetOpenGl
     }
 
     public class C64HostConfig : IHostSystemConfig, ICloneable
     {
         public C64HostRenderer Renderer { get; set; } = C64HostRenderer.SkiaSharp;
         public C64SilkNetOpenGlRendererConfig SilkNetOpenGlRendererConfig { get; set; } = new C64SilkNetOpenGlRendererConfig();
-        public C64SilkNetConfig InputConfig { get; set; } = new C64SilkNetConfig();
+        public C64SilkNetInputConfig InputConfig { get; set; } = new C64SilkNetInputConfig();
 
         public object Clone()
         {
             var clone = (C64HostConfig)this.MemberwiseClone();
-            clone.InputConfig = (C64SilkNetConfig)InputConfig.Clone();
+            clone.InputConfig = (C64SilkNetInputConfig)InputConfig.Clone();
             clone.SilkNetOpenGlRendererConfig = (C64SilkNetOpenGlRendererConfig)SilkNetOpenGlRendererConfig.Clone();
             return clone;
         }

diff --git a/src/apps/Highbyte.DotNet6502.App.SilkNetNative/SystemSetup/C64Setup.cs b/src/apps/Highbyte.DotNet6502.App.SilkNetNative/SystemSetup/C64Setup.cs
@@ -4,7 +4,8 @@
 using Highbyte.DotNet6502.Impl.SilkNet.Commodore64.Input;
 using Highbyte.DotNet6502.Impl.SilkNet.Commodore64.Video;
 using Highbyte.DotNet6502.Impl.Skia;
-using Highbyte.DotNet6502.Impl.Skia.Commodore64.Video;
+using Highbyte.DotNet6502.Impl.Skia.Commodore64.Video.v1;
+using Highbyte.DotNet6502.Impl.Skia.Commodore64.Video.v2;
 using Highbyte.DotNet6502.Systems;
 using Highbyte.DotNet6502.Systems.Commodore64;
 using Highbyte.DotNet6502.Systems.Commodore64.Config;
@@ -111,6 +112,14 @@ NAudioAudioHandlerContext audioHandlerContext
                 renderer = new C64SkiaRenderer();
                 renderContext = renderContextContainer.SkiaRenderContext;
                 break;
+            case C64HostRenderer.SkiaSharp2:
+                renderer = new C64SkiaRenderer2();
+                renderContext = renderContextContainer.SkiaRenderContext;
+                break;
+            case C64HostRenderer.SkiaSharp2b:
+                renderer = new C64SkiaRenderer2b();
+                renderContext = renderContextContainer.SkiaRenderContext;
+                break;
             case C64HostRenderer.SilkNetOpenGl:
                 renderer = new C64SilkNetOpenGlRenderer(c64HostConfig.SilkNetOpenGlRendererConfig);
                 renderContext = renderContextContainer.SilkNetOpenGlRenderContext;

diff --git a/src/apps/Highbyte.DotNet6502.App.WASM/Highbyte.DotNet6502.App.WASM.csproj b/src/apps/Highbyte.DotNet6502.App.WASM/Highbyte.DotNet6502.App.WASM.csproj
@@ -40,7 +40,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
     <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="8.0.0" />
-    <PackageReference Include="SkiaSharp.Views.Blazor" Version="2.88.6" />
+    <PackageReference Include="SkiaSharp.Views.Blazor" Version="3.0.0-preview.3.1" />
     <PackageReference Include="PublishSPAforGitHubPages.Build" Version="2.1.0" />
     <PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
     <PackageReference Include="Toolbelt.Blazor.Gamepad" Version="8.0.0.1" />

diff --git a/src/apps/Highbyte.DotNet6502.App.WASM/Pages/Commodore64/C64ConfigUI.razor b/src/apps/Highbyte.DotNet6502.App.WASM/Pages/Commodore64/C64ConfigUI.razor
@@ -67,6 +67,17 @@
     <div class="column">
         <h4>General settings</h4>
         <div class="table">
+            <div class="table-row">
+                <div class="table-cell twocol">Renderer:</div>
+                <div class="table-cell twocol">
+                    <select value="@C64HostConfig.Renderer" @onchange="OnRendererChanged">
+                        @foreach (var renderer in Enum.GetNames<C64HostRenderer>())
+                        {
+                            <option value="@renderer"> @renderer </option>
+                        }
+                    </select>
+                </div>
+            </div>
             <div class="table-row">
                 <div class="table-cell twocol">Audio enabled (experimental):</div>
                 <div class="table-cell twocol"><input @bind="C64Config.AudioEnabled" @bind:event="oninput" type="checkbox" id="audioEnabled" title="Enable audio" /></div>
@@ -274,10 +285,14 @@
         rom.Data = data;
     }
 
+    private void OnRendererChanged(ChangeEventArgs e)
+        => C64HostConfig.Renderer = Enum.Parse<C64HostRenderer>(e.Value!.ToString()!);
+
     private void OnSelectJoystickChanged(ChangeEventArgs e) 
         => C64HostConfig.InputConfig.CurrentJoystick = int.Parse(e.Value!.ToString()!);
 
     private void OnSelectKeyboardJoystickChanged(ChangeEventArgs e)
         => C64Config.KeyboardJoystick = int.Parse(e.Value!.ToString()!);
+
 
 }
diff --git a/src/apps/Highbyte.DotNet6502.App.WASM/Pages/Index.razor.cs b/src/apps/Highbyte.DotNet6502.App.WASM/Pages/Index.razor.cs
@@ -144,7 +144,10 @@ protected override async Task OnInitializedAsync()
         // Add systems
         _systemList = new SystemList<SkiaRenderContext, AspNetInputHandlerContext, WASMAudioHandlerContext>();
 
-        var c64HostConfig = new C64HostConfig();
+        var c64HostConfig = new C64HostConfig
+        {
+            Renderer = C64HostRenderer.SkiaSharp,
+        };
         var c64Setup = new C64Setup(_browserContext, LoggerFactory, c64HostConfig);
         _systemList.AddSystem(c64Setup);
 

diff --git a/src/apps/Highbyte.DotNet6502.App.WASM/Skia/C64HostConfig.cs b/src/apps/Highbyte.DotNet6502.App.WASM/Skia/C64HostConfig.cs
@@ -1,17 +1,25 @@
-
-using Highbyte.DotNet6502.Impl.AspNet.Commodore64;
+using Highbyte.DotNet6502.Impl.AspNet.Commodore64.Input;
 using Highbyte.DotNet6502.Systems;
 
 namespace Highbyte.DotNet6502.App.WASM.Skia
 {
+    public enum C64HostRenderer
+    {
+        SkiaSharp,
+        SkiaSharp2,  // Experimental render directly to pixel buffer backed by a SKBitmap + Skia shader (SKSL)
+        SkiaSharp2b, // Experimental render after each instruction directly to pixel buffer backed by a SKBitmap + Skia shader (SKSL)
+    }
     public class C64HostConfig : IHostSystemConfig, ICloneable
     {
-        public C64AspNetConfig InputConfig { get; set; } = new C64AspNetConfig();
+
+        public C64HostRenderer Renderer { get; set; } = C64HostRenderer.SkiaSharp;
+
+        public C64AspNetInputConfig InputConfig { get; set; } = new C64AspNetInputConfig();
 
         public object Clone()
         {
             var clone = (C64HostConfig)MemberwiseClone();
-            clone.InputConfig = (C64AspNetConfig)InputConfig.Clone();
+            clone.InputConfig = (C64AspNetInputConfig)InputConfig.Clone();
             return clone;
         }
     }

diff --git a/src/apps/Highbyte.DotNet6502.App.WASM/Skia/C64Setup.cs b/src/apps/Highbyte.DotNet6502.App.WASM/Skia/C64Setup.cs
@@ -2,7 +2,8 @@
 using Highbyte.DotNet6502.Impl.AspNet.Commodore64.Audio;
 using Highbyte.DotNet6502.Impl.AspNet.Commodore64.Input;
 using Highbyte.DotNet6502.Impl.Skia;
-using Highbyte.DotNet6502.Impl.Skia.Commodore64.Video;
+using Highbyte.DotNet6502.Impl.Skia.Commodore64.Video.v1;
+using Highbyte.DotNet6502.Impl.Skia.Commodore64.Video.v2;
 using Highbyte.DotNet6502.Systems;
 using Highbyte.DotNet6502.Systems.Commodore64;
 using Highbyte.DotNet6502.Systems.Commodore64.Config;
@@ -76,12 +77,29 @@ public SystemRunner BuildSystemRunner(
         WASMAudioHandlerContext audioHandlerContext
         )
     {
-        var c64 = (C64)system;
+        var c64HostConfig = (C64HostConfig)hostSystemConfig;
+
+        IRenderer renderer;
+        switch (c64HostConfig.Renderer)
+        {
+            case C64HostRenderer.SkiaSharp:
+                renderer = new C64SkiaRenderer();
+                break;
+            case C64HostRenderer.SkiaSharp2:
+                renderer = new C64SkiaRenderer2();
+                break;
+            case C64HostRenderer.SkiaSharp2b:
+                renderer = new C64SkiaRenderer2b();
+                break;
+            default:
+                throw new NotImplementedException($"Renderer {c64HostConfig.Renderer} not implemented.");
+        }
+
 
-        var renderer = new C64SkiaRenderer();
         var inputHandler = new C64AspNetInputHandler(_loggerFactory, _hostConfig.InputConfig);
         var audioHandler = new C64WASMAudioHandler(_loggerFactory);
 
+        var c64 = (C64)system;
         renderer.Init(c64, renderContext);
         inputHandler.Init(c64, inputHandlerContext);
         audioHandler.Init(c64, audioHandlerContext);

diff --git a/src/apps/Highbyte.DotNet6502.App.WASM/Skia/WasmHost.cs b/src/apps/Highbyte.DotNet6502.App.WASM/Skia/WasmHost.cs
@@ -165,8 +165,9 @@ public void Cleanup()
         // Clean up input handler resources
         InputHandlerContext?.Cleanup();
 
-        // Stop any playing audio
-        _systemRunner.AudioHandler.StopPlaying();
+        // Cleanup system runner (including stop any playing audio)
+        _systemRunner.Cleanup();
+
         // Clean up audio resources
         //AudioHandlerContext?.Cleanup();
     }

diff --git a/src/apps/Highbyte.DotNet6502.App.WASM/global.json b/src/apps/Highbyte.DotNet6502.App.WASM/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "8.0.100"
+    "version": "8.0.303"
   }
 }
diff --git a/...mpl.AspNet/Commodore64/C64AspNetConfig.cs → ...Commodore64/Input/C64AspNetInputConfig.cs b/...mpl.AspNet/Commodore64/C64AspNetConfig.cs → ...Commodore64/Input/C64AspNetInputConfig.cs
@@ -1,8 +1,8 @@
 using Highbyte.DotNet6502.Systems.Commodore64.TimerAndPeripheral;
 
-namespace Highbyte.DotNet6502.Impl.AspNet.Commodore64
+namespace Highbyte.DotNet6502.Impl.AspNet.Commodore64.Input
 {
-    public class C64AspNetConfig : ICloneable
+    public class C64AspNetInputConfig : ICloneable
     {
         public int CurrentJoystick = 2;
 

diff --git a/src/libraries/Highbyte.DotNet6502.Impl.AspNet/Commodore64/Input/C64AspNetInputHandler.cs b/src/libraries/Highbyte.DotNet6502.Impl.AspNet/Commodore64/Input/C64AspNetInputHandler.cs
@@ -12,12 +12,12 @@ public class C64AspNetInputHandler : IInputHandler<C64, AspNetInputHandlerContex
     private AspNetInputHandlerContext? _inputHandlerContext = default!;
     private readonly ILogger<C64AspNetInputHandler> _logger;
     private C64AspNetKeyboard _c64AspNetKeyboard = default!;
-    private readonly C64AspNetConfig _c64AspNetConfig;
+    private readonly C64AspNetInputConfig _c64AspNetConfig;
 
     // Instrumentations
     public Instrumentations Instrumentations { get; } = new();
 
-    public C64AspNetInputHandler(ILoggerFactory loggerFactory, C64AspNetConfig c64AspNetConfig)
+    public C64AspNetInputHandler(ILoggerFactory loggerFactory, C64AspNetInputConfig c64AspNetConfig)
     {
         _logger = loggerFactory.CreateLogger<C64AspNetInputHandler>();
         _c64AspNetConfig = c64AspNetConfig;

diff --git a/src/libraries/Highbyte.DotNet6502.Impl.SadConsole/Commodore64/Video/C64SadConsoleRenderer.cs b/src/libraries/Highbyte.DotNet6502.Impl.SadConsole/Commodore64/Video/C64SadConsoleRenderer.cs
@@ -28,6 +28,10 @@ public void Init(ISystem system, IRenderContext renderContext)
         Init((C64)system, (SadConsoleRenderContext)renderContext);
     }
 
+    public void Cleanup()
+    {
+    }
+
     public void Draw(C64 c64)
     {
         RenderMainScreen(c64);

diff --git a/src/libraries/Highbyte.DotNet6502.Impl.SadConsole/Generic/Video/GenericSadConsoleRenderer.cs b/src/libraries/Highbyte.DotNet6502.Impl.SadConsole/Generic/Video/GenericSadConsoleRenderer.cs
@@ -30,6 +30,10 @@ public void Init(ISystem system, IRenderContext renderContext)
         Init((GenericComputer)system, (SadConsoleRenderContext)renderContext);
     }
 
+    public void Cleanup()
+    {
+    }
+
     public void Draw(GenericComputer system)
     {
         RenderMainScreen(system);

diff --git a/...l.SilkNet/Commodore64/C64SilkNetConfig.cs → ...ommodore64/Input/C64SilkNetInputConfig.cs b/...l.SilkNet/Commodore64/C64SilkNetConfig.cs → ...ommodore64/Input/C64SilkNetInputConfig.cs
@@ -1,8 +1,8 @@
 using Highbyte.DotNet6502.Systems.Commodore64.TimerAndPeripheral;
 
-namespace Highbyte.DotNet6502.Impl.SilkNet.Commodore64
+namespace Highbyte.DotNet6502.Impl.SilkNet.Commodore64.Input
 {
-    public class C64SilkNetConfig : ICloneable
+    public class C64SilkNetInputConfig : ICloneable
     {
         public int CurrentJoystick = 2;
 
@@ -36,7 +36,7 @@ public class C64SilkNetConfig : ICloneable
 
         public object Clone()
         {
-            return this.MemberwiseClone();
+            return MemberwiseClone();
         }
     }
 }
diff --git a/src/libraries/Highbyte.DotNet6502.Impl.SilkNet/Commodore64/Input/C64SilkNetInputHandler.cs b/src/libraries/Highbyte.DotNet6502.Impl.SilkNet/Commodore64/Input/C64SilkNetInputHandler.cs
@@ -13,14 +13,14 @@ public class C64SilkNetInputHandler : IInputHandler<C64, SilkNetInputHandlerCont
     //private readonly C64SilkNetGamepad _c64SilkNetGamepad;
 
     private readonly ILogger<C64SilkNetInputHandler> _logger;
-    private readonly C64SilkNetConfig _c64SilkNetConfig;
+    private readonly C64SilkNetInputConfig _c64SilkNetConfig;
     public List<string> GetDebugInfo() => new();
 
     // Instrumentations
     public Instrumentations Instrumentations { get; } = new();
 
 
-    public C64SilkNetInputHandler(ILoggerFactory loggerFactory, C64SilkNetConfig c64SilkNetConfig)
+    public C64SilkNetInputHandler(ILoggerFactory loggerFactory, C64SilkNetInputConfig c64SilkNetConfig)
     {
         _logger = loggerFactory.CreateLogger<C64SilkNetInputHandler>();
         _c64SilkNetConfig = c64SilkNetConfig;

diff --git a/src/libraries/Highbyte.DotNet6502.Impl.SilkNet/Commodore64/Video/C64SilkNetOpenGlRenderer.cs b/src/libraries/Highbyte.DotNet6502.Impl.SilkNet/Commodore64/Video/C64SilkNetOpenGlRenderer.cs
@@ -140,6 +140,20 @@ public void Init(C64 c64, SilkNetOpenGlRenderContext silkNetOpenGlRenderContext)
         InitShader(c64);
     }
 
+    public void Cleanup()
+    {
+        _shader?.Dispose();
+        _vba?.Dispose();
+        _vbo?.Dispose();
+        _uboTextData?.Dispose();
+        _uboCharsetData?.Dispose();
+        _uboBitmapData?.Dispose();
+        _uboColorMapData?.Dispose();
+        _uboScreenLineData?.Dispose();
+        _uboSpriteData?.Dispose();
+        _uboSpriteContentData?.Dispose();
+    }
+
     private void InitShader(C64 c64)
     {
 #if DEBUG

diff --git a/src/libraries/Highbyte.DotNet6502.Impl.SilkNet/Commodore64/Video/C64shader.frag b/src/libraries/Highbyte.DotNet6502.Impl.SilkNet/Commodore64/Video/C64shader.frag
@@ -211,17 +211,18 @@ bool GetMultiColor(uint charLine, uint charsetBitPosition, vec4 color01, vec4 co
 bool GetTextModePixelColor(uint x, uint y, out bool border, out vec4 pixelColor)
 {
     // Detect border area, draw only border color
-    uint horizontalBorderOffset = uScreenLineData[y].colMode40 == 1u ? 0u : 8u;
+    uint horizontalLeftBorderOffset = uScreenLineData[y].colMode40 == 1u ? 0u : 7u;
+    uint horizontalRightBorderOffset = uScreenLineData[y].colMode40 == 1u ? 0u : 9u;
     uint verticalBorderOffset = uScreenLineData[y].rowMode25 == 1u ? 0u : 4u;
 
     // Workaround for 38 col mode (to counter fine x scroll value is set to +1 in 38 col mode)
-    if(horizontalBorderOffset!=0u)
-        x=x+1u;
+//    if(horizontalBorderOffset!=0u)
+//        x=x+1u;
     // Workaround for 24 row mode (to counter fine y scroll value is set to +1 in 24 row mode)
     if(verticalBorderOffset!=0u)
         y=y+1u;
 
-    if((x < (uTextScreenStart.x+horizontalBorderOffset) || (x > (uTextScreenEnd.x-horizontalBorderOffset)))
+    if((x < (uTextScreenStart.x+horizontalLeftBorderOffset) || (x > (uTextScreenEnd.x-horizontalRightBorderOffset)))
          || (y < (uTextScreenStart.y+verticalBorderOffset) || (y > (uTextScreenEnd.y-verticalBorderOffset))) )
     {
         border = true;