Fix blank screen when using Vulkan

CommitteeOfZero · Oct 6, 2022 · 4633136 · 4633136
1 parent 45728a9
commit 4633136
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/NitroSharp/GameContext.cs b/src/NitroSharp/GameContext.cs
@@ -144,7 +144,7 @@ public static async Task<GameContext> Create(GameWindow window, Config config, G
             var startVM = Task.Run(() => LoadStartupScript(profile, fontConfig, logger));
 
             SwapchainSource swapchainSource = await createSurface.Task;
-            (GraphicsDevice gd, Swapchain swapchain) = InitGraphics(window, config);
+            (GraphicsDevice gd, Swapchain swapchain) = InitGraphics(window, config, profile);
             ContentManager contentMgr = CreateContentManager(gd, profile);
             AudioContext audioContext = await initAudio;
             (NsScriptVM vm, GameProcess mainProcess) = await startVM;
@@ -229,7 +229,8 @@ private static AudioContext InitAudio(Config config)
 
         private static (GraphicsDevice device, Swapchain swapchain) InitGraphics(
             GameWindow window,
-            Config configuration)
+            Config configuration,
+            GameProfile gameProfile)
         {
             var options = new GraphicsDeviceOptions(false, null, configuration.EnableVSync);
             options.PreferStandardClipSpaceYDirection = true;
@@ -238,7 +239,7 @@ private static (GraphicsDevice device, Swapchain swapchain) InitGraphics(
 #endif
             GraphicsBackend backend = configuration.PreferredGraphicsBackend
                 ?? VeldridStartup.GetPlatformDefaultBackend();
-            Size renderResolution = configuration.RenderResolution;
+            Size renderResolution = gameProfile.DesignResolution;
             var swapchainDesc = new SwapchainDescription(
                 window.SwapchainSource,
                 renderResolution.Width, renderResolution.Height,

diff --git a/src/NitroSharp/NitroSharp.csproj b/src/NitroSharp/NitroSharp.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net7.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>1701;1702;CA1063;IDE1006;IDE0063;VSTHRD002;VSTHRD003;VSTHRD103;VSTHRD105;VSTHRD200</NoWarn>
-    <VeldridVersion>4.9.0-g32bf3145d0</VeldridVersion>
+    <VeldridVersion>4.9.0-beta2</VeldridVersion>
     <Nullable>enable</Nullable>
   </PropertyGroup>