Portability bits

alt-romes · May 17, 2024 · 581442f · 581442f
1 parent 45ba5c3
commit 581442f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/ghengin-core/ghengin-vulkan/Ghengin/Vulkan/Renderer.hs b/ghengin-core/ghengin-vulkan/Ghengin/Vulkan/Renderer.hs
@@ -254,7 +254,9 @@ deviceExtensions :: Vector ByteString
 deviceExtensions = [ Vk.KHR_SWAPCHAIN_EXTENSION_NAME
 
                      -- required at least from 1.3 with MoltenVk
+#if defined(darwin_HOST_OS)
                    , Vk.KHR_PORTABILITY_SUBSET_EXTENSION_NAME
+#endif
                    ]
 
 rateFn :: Vk.SurfaceKHR -> DeviceRateFunction

diff --git a/ghengin-core/ghengin-vulkan/Ghengin/Vulkan/Renderer/Device/Instance.hs b/ghengin-core/ghengin-vulkan/Ghengin/Vulkan/Renderer/Device/Instance.hs
@@ -67,7 +67,10 @@ createInstance validationLayers = Linear.liftSystemIO $ do
     instanceInfo glfwe
       = Vk.InstanceCreateInfo {..} where
           next  = ()
-          flags = Vk.InstanceCreateFlagBits 0 .|. Vk.INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR -- required at least on 1.3 w MoltenVk
+          flags = Vk.InstanceCreateFlagBits 0
+#if defined(darwin_HOST_OS)
+                    .|. Vk.INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR -- required at least on 1.3 w MoltenVk
+#endif
           applicationInfo = Just appInfo
           enabledLayerNames = validationLayers
           enabledExtensionNames = instanceExtensions <> glfwe

diff --git a/shell.nix b/shell.nix
@@ -16,6 +16,14 @@ mkShell {
     # renderdoc           # Graphics debugger
     # tracy               # Graphics profiler
     vulkan-tools-lunarg # vkconfig
+
+    # bindings-GLFW
+    xorg.libX11
+    xorg.libXi
+    xorg.libXrandr
+    xorg.libXxf86vm
+    xorg.libXcursor
+    xorg.libXinerama
   ];
 
   buildInputs = with pkgs; [