[Vulkan] Reorganize resources folder

- Reorganizd files - Deleted unused Pipeline type - Removed TextureFormat.ofGLSLType
aardvark-platform · Jun 17, 2024 · 5f7d812 · 5f7d812
1 parent cec2b38
commit 5f7d812
Show file tree

Hide file tree

Showing 17 changed files with 44 additions and 775 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -10,6 +10,8 @@
 - [GL] Cleanup up shader program creation and caching. Removed various methods for creating and compiling shaders from `Context`.
 - Removed obsolete IResourceManager interface
 - Removed various other obsolete APIs
+- [Vulkan] Removed unused `Pipeline` type
+- [Vulkan] Removed `TextureFormat.ofGLSLType`
 
 ### 5.4.10
 - [OpenVR] changed GL texture submit to 2 textures (previously side by side, issue with Quest 3)

diff --git a/src/Aardvark.Rendering.Vulkan/Aardvark.Rendering.Vulkan.fsproj b/src/Aardvark.Rendering.Vulkan/Aardvark.Rendering.Vulkan.fsproj
@@ -31,7 +31,9 @@
     <Compile Include="Core\Device.fs" />
     <Compile Include="Core\Commands.fs" />
     <Compile Include="Core\ShaderInterface.fs" />
-    <Compile Include="Resources\Buffer.fs" />
+    <Compile Include="Resources\Buffers\Buffer.fs" />
+    <Compile Include="Resources\Buffers\UniformBuffer.fs" />
+    <Compile Include="Resources\Buffers\IndirectBuffer.fs" />
     <Compile Include="Resources\Image\ComponentMapping.fs" />
     <Compile Include="Resources\Image\Image.fs" />
     <Compile Include="Resources\Image\DeviceTensor.fs" />
@@ -42,33 +44,29 @@
     <Compile Include="Resources\Image\ImageView.fs" />
     <Compile Include="Resources\Image\SparseImage.fs" />
     <Compile Include="Resources\Sampler.fs" />
-    <Compile Include="Resources\RenderPass.fs" />
-    <Compile Include="Resources\BackendSurface.fs" />
-    <Compile Include="Resources\Framebuffer.fs" />
-    <Compile Include="Resources\ShaderModule.fs" />
-    <Compile Include="Resources\DescriptorSetLayout.fs" />
-    <Compile Include="Resources\PipelineLayout.fs" />
-    <Compile Include="Resources\ShaderProgram.fs" />
-    <Compile Include="Resources\ComputeProgram.fs" />
-    <Compile Include="Resources\UniformBuffer.fs" />
+    <Compile Include="Resources\Pipeline\RenderPass.fs" />
+    <Compile Include="Resources\Pipeline\DescriptorSetLayout.fs" />
+    <Compile Include="Resources\Pipeline\PipelineLayout.fs" />
+    <Compile Include="Resources\Pipeline\PipelineStates.fs" />
+    <Compile Include="Resources\Shaders\ShaderModule.fs" />
+    <Compile Include="Resources\Shaders\ShaderProgram.fs" />
+    <Compile Include="Resources\Shaders\ComputeProgram.fs" />
     <Compile Include="Resources\Raytracing\AccelerationStructureData.fs" />
     <Compile Include="Resources\Raytracing\AccelerationStructure.fs" />
     <Compile Include="Resources\Raytracing\ShaderGroup.fs" />
     <Compile Include="Resources\Raytracing\RaytracingProgram.fs" />
     <Compile Include="Resources\Raytracing\RaytracingPipeline.fs" />
     <Compile Include="Resources\Raytracing\ShaderBindingTable.fs" />
     <Compile Include="Resources\Raytracing\InstanceBuffer.fs" />
-    <Compile Include="Resources\DescriptorPool.fs" />
-    <Compile Include="Resources\DescriptorSet.fs" />
-    <Compile Include="Resources\States.fs" />
-    <Compile Include="Resources\Pipeline.fs" />
-    <Compile Include="Resources\IndirectBuffer.fs" />
-    <Compile Include="Resources\GeometryPool.fs" />
+    <Compile Include="Resources\Descriptors\DescriptorPool.fs" />
+    <Compile Include="Resources\Descriptors\DescriptorSet.fs" />
     <Compile Include="Resources\Query\QueryPool.fs" />
     <Compile Include="Resources\Query\Query.fs" />
     <Compile Include="Resources\Query\TimeQuery.fs" />
     <Compile Include="Resources\Query\OcclusionQuery.fs" />
     <Compile Include="Resources\Query\PipelineQuery.fs" />
+    <Compile Include="Resources\Framebuffer.fs" />
+    <Compile Include="Resources\GeometryPool.fs" />
     <Compile Include="Swapchain\Surface.fs" />
     <Compile Include="Swapchain\SwapchainDescription.fs" />
     <Compile Include="Swapchain\Swapchain.fs" />

diff --git a/src/Aardvark.Rendering.Vulkan/Core/Flags.fs b/src/Aardvark.Rendering.Vulkan/Core/Flags.fs
@@ -344,6 +344,23 @@ module VkImageUsageFlags =
         let unsupported = getUnsupported features
         usage &&& ~~~unsupported
 
+[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
+module VkShaderStageFlags =
+    let ofShaderStage =
+        LookupTable.lookupTable [
+            ShaderStage.Vertex,         VkShaderStageFlags.VertexBit
+            ShaderStage.TessControl,    VkShaderStageFlags.TessellationControlBit
+            ShaderStage.TessEval,       VkShaderStageFlags.TessellationEvaluationBit
+            ShaderStage.Geometry,       VkShaderStageFlags.GeometryBit
+            ShaderStage.Fragment,       VkShaderStageFlags.FragmentBit
+            ShaderStage.Compute,        VkShaderStageFlags.ComputeBit
+            ShaderStage.RayGeneration,  VkShaderStageFlags.RaygenBitKhr
+            ShaderStage.Intersection,   VkShaderStageFlags.IntersectionBitKhr
+            ShaderStage.AnyHit,         VkShaderStageFlags.AnyHitBitKhr
+            ShaderStage.ClosestHit,     VkShaderStageFlags.ClosestHitBitKhr
+            ShaderStage.Miss,           VkShaderStageFlags.MissBitKhr
+            ShaderStage.Callable,       VkShaderStageFlags.CallableBitKhr
+        ]
 
 [<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
 module internal VkSampleCountFlags =