More rt changes

src/Engine/Graphics/RenderPass/RayTracingPass.cpp

@@ -20,16 +20,6 @@ RayTracingPass::RayTracingPass(Gfx::PGraphics graphics, PScene scene) : RenderPa
         .binding = 2,
         .descriptorType = Gfx::SE_DESCRIPTOR_TYPE_STORAGE_BUFFER,
     });
-    paramsLayout->addDescriptorBinding(Gfx::DescriptorBinding{
-        .binding = 3,
-        .descriptorType = Gfx::SE_DESCRIPTOR_TYPE_STORAGE_BUFFER,
-        .access = Gfx::SE_DESCRIPTOR_ACCESS_READ_WRITE_BIT,
-    });
-    paramsLayout->addDescriptorBinding(Gfx::DescriptorBinding{
-        .binding = 4,
-        .descriptorType = Gfx::SE_DESCRIPTOR_TYPE_STORAGE_BUFFER,
-        .access = Gfx::SE_DESCRIPTOR_ACCESS_READ_WRITE_BIT,
-    });
     paramsLayout->create();
     pipelineLayout = graphics->createPipelineLayout("RayTracing");
     pipelineLayout->addDescriptorLayout(viewParamsLayout);
@@ -92,8 +82,6 @@ void RayTracingPass::render() {
     desc->updateAccelerationStructure(0, tlas);
     desc->updateTexture(1, Gfx::PTexture2D(texture));
     desc->updateBuffer(2, StaticMeshVertexData::getInstance()->getIndexBuffer());
-    desc->updateBuffer(3, directionBuffer);
-    desc->updateBuffer(4, originBuffer);
     desc->writeChanges();
 
     Gfx::PRayTracingPipeline pipeline = graphics->createRayTracingPipeline(Gfx::RayTracingPipelineCreateInfo{
@@ -146,22 +134,6 @@ void RayTracingPass::publishOutputs() {
     closestHit = graphics->createClosestHitShader({1});
     miss = graphics->createMissShader({2});
     pipelineLayout->create();
-    directionBuffer = graphics->createShaderBuffer(ShaderBufferCreateInfo{
-        .sourceData =
-            {
-                .size = sizeof(Vector) * texture->getWidth() * texture->getHeight(),
-            },
-        .dynamic = true,
-        .name = "DirectionBuffer",
-    });
-    originBuffer = graphics->createShaderBuffer(ShaderBufferCreateInfo{
-        .sourceData =
-            {
-                .size = sizeof(Vector) * texture->getWidth() * texture->getHeight(),
-            },
-        .dynamic = true,
-        .name = "OriginBuffer",
-    });
 }
 
 void RayTracingPass::createRenderPass() {}

src/Engine/Graphics/RenderPass/RayTracingPass.h

@@ -21,7 +21,5 @@ class RayTracingPass : public RenderPass {
     Gfx::ORayGenShader rayGen;
     Gfx::OClosestHitShader closestHit;
     Gfx::OMissShader miss;
-    Gfx::OShaderBuffer directionBuffer;
-    Gfx::OShaderBuffer originBuffer;
 };
 } // namespace Seele

src/Engine/Graphics/Vulkan/Graphics.cpp

@@ -644,9 +644,6 @@ void Graphics::initInstance(GraphicsInitializer initInfo) {
     }
 #ifdef __APPLE__
     extensions.add("VK_KHR_portability_enumeration");
-#endif
-#if ENABLE_VALIDATION
-    initInfo.layers.add("VK_LAYER_KHRONOS_validation");
 #endif
     VkInstanceCreateInfo info = {
         .sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO,
@@ -853,10 +850,9 @@ void Graphics::createDevice(GraphicsInitializer initializer) {
 #ifdef __APPLE__
     initializer.deviceExtensions.add("VK_KHR_portability_subset");
 #endif
-    initializer.deviceExtensions.add(VK_KHR_DEFERRED_HOST_OPERATIONS_EXTENSION_NAME);
     initializer.deviceExtensions.add(VK_KHR_ACCELERATION_STRUCTURE_EXTENSION_NAME);
     initializer.deviceExtensions.add(VK_KHR_RAY_TRACING_PIPELINE_EXTENSION_NAME);
-    initializer.deviceExtensions.add(VK_KHR_DEDICATED_ALLOCATION_EXTENSION_NAME);
+    initializer.deviceExtensions.add(VK_KHR_DEFERRED_HOST_OPERATIONS_EXTENSION_NAME);
     VkDeviceCreateInfo deviceInfo = {
         .sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO,
         .pNext = &features,

src/Engine/Graphics/Vulkan/Texture.cpp

@@ -88,7 +88,7 @@ TextureHandle::TextureHandle(PGraphics graphics, VkImageViewType viewType, const
     const DataSource& sourceData = createInfo.sourceData;
     if (sourceData.size > 0) {
         changeLayout(Gfx::SE_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_ACCESS_NONE, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT,
-                     VK_ACCESS_MEMORY_WRITE_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT);
+                     VK_ACCESS_TRANSFER_WRITE_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT);
         void* data;
         VkBufferCreateInfo stagingInfo = {
             .sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,
@@ -134,7 +134,7 @@ TextureHandle::TextureHandle(PGraphics graphics, VkImageViewType viewType, const
         commandPool->getCommands()->bindResource(PBufferAllocation(stagingAlloc));
         generateMipmaps();
         // When loading a texture from a file, we will almost always use it as a texture map for fragment shaders
-        changeLayout(Gfx::SE_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, VK_ACCESS_TRANSFER_WRITE_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,
+        changeLayout(Gfx::SE_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, VK_ACCESS_TRANSFER_READ_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,
                      VK_ACCESS_SHADER_READ_BIT, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT);
         graphics->getDestructionManager()->queueResourceForDestruction(std::move(stagingAlloc));
     }