diff --git a/src/Init.hs b/src/Init.hs index 52a93c5..b56edd0 100644 --- a/src/Init.hs +++ b/src/Init.hs @@ -119,7 +119,7 @@ initVulkan window = do initScene - return $ EngineData + EngineData window dimensions vulkanPhysicalDevice @@ -137,6 +137,7 @@ initVulkan window = do frames descriptorSetLayout descriptorPool + <$> Vk.getPhysicalDeviceProperties vulkanPhysicalDevice initScene :: (MonadReader ReadState m, MonadIO m) => m () initScene = do diff --git a/src/Types.hs b/src/Types.hs index f7d7845..8800510 100644 --- a/src/Types.hs +++ b/src/Types.hs @@ -24,23 +24,24 @@ data ShaderContainer = ShaderContainer deriving (Show) data EngineData = EngineData - { engineWindow :: SDL.Window - , engineWindowDimensions :: V2 CInt - , enginePhysicalDevice :: Vk.PhysicalDevice - , engineLogicalDevice :: Vk.Device - , engineInstance :: Vk.Instance - , engineSwapchain :: Vk.SwapchainKHR - , engineQueue :: Vk.Queue - , engineFramebuffers :: V.Vector Vk.Framebuffer - , meshPipelineLayout :: Vk.PipelineLayout - , engineRenderPass :: Vk.RenderPass - , engineAllocator :: VMA.Allocator - , engineDepthImageView :: Vk.ImageView - , engineDepthImage :: AllocatedImage - , engineDepthFormat :: Vk.Format - , engineFrames :: V.Vector FrameData - , engineGlobalSetLayout :: Vk.DescriptorSetLayout - , engineDescriptorPool :: Vk.DescriptorPool + { engineWindow :: SDL.Window + , engineWindowDimensions :: V2 CInt + , enginePhysicalDevice :: Vk.PhysicalDevice + , engineLogicalDevice :: Vk.Device + , engineInstance :: Vk.Instance + , engineSwapchain :: Vk.SwapchainKHR + , engineQueue :: Vk.Queue + , engineFramebuffers :: V.Vector Vk.Framebuffer + , meshPipelineLayout :: Vk.PipelineLayout + , engineRenderPass :: Vk.RenderPass + , engineAllocator :: VMA.Allocator + , engineDepthImageView :: Vk.ImageView + , engineDepthImage :: AllocatedImage + , engineDepthFormat :: Vk.Format + , engineFrames :: V.Vector FrameData + , engineGlobalSetLayout :: Vk.DescriptorSetLayout + , engineDescriptorPool :: Vk.DescriptorPool + , enginePhysicalDeviceProperties :: Vk.PhysicalDeviceProperties } data AllocatedBuffer = AllocatedBuffer