Lighting is broken again

src/Engine/Graphics/RenderPass/LightCullingPass.cpp

@@ -34,6 +34,7 @@ void LightCullingPass::beginFrame(const Component::Camera& cam)
     DataSource counterReset = {
         .size = sizeof(uint32),
         .data = (uint8*)&reset,
+        .owner = Gfx::QueueType::COMPUTE
     };
     oLightIndexCounter->updateContents(counterReset);
     tLightIndexCounter->updateContents(counterReset);
@@ -46,9 +47,6 @@ void LightCullingPass::beginFrame(const Component::Camera& cam)
 
     cullingDescriptorLayout->reset();
     cullingDescriptorSet = cullingDescriptorLayout->allocateDescriptorSet();
-
-    //std::cout << "LightCulling beginFrame()" << std::endl;
-    //co_return;
 }
 
 void LightCullingPass::render() 
@@ -72,14 +70,10 @@ void LightCullingPass::render()
     Array<Gfx::PComputeCommand> commands = {computeCommand};
     //std::cout << "Execute" << std::endl;
     graphics->executeCommands(commands);
-    //std::cout << "LightCulling render()" << std::endl;
-    //co_return;
 }
 
 void LightCullingPass::endFrame() 
 {
-    //std::cout << "LightCulling endFrame()" << std::endl;
-    //co_return;
 }
 
 void LightCullingPass::publishOutputs() 
@@ -94,10 +88,17 @@ void LightCullingPass::publishOutputs()
         .sourceData = {
             .size = sizeof(DispatchParams),
             .data = (uint8*)&dispatchParams,
+            .owner = Gfx::QueueType::COMPUTE
         },
         .dynamic = false,
+        .name = "DispatchParams",
         });
 
+    dispatchParamsSet = dispatchParamsLayout->allocateDescriptorSet();
+    dispatchParamsSet->updateBuffer(0, dispatchParamsBuffer);
+    dispatchParamsSet->updateBuffer(1, frustumBuffer);
+    dispatchParamsSet->writeChanges();
+
     cullingDescriptorLayout = graphics->createDescriptorLayout("CullingLayout");
 
     //DepthTexture
@@ -226,20 +227,24 @@ void LightCullingPass::setupFrustums()
         .sourceData = {
             .size = sizeof(DispatchParams),
             .data = (uint8*) & dispatchParams,
+            .owner = Gfx::QueueType::COMPUTE
         },
         .dynamic = false,
+        .name = "FrustumDispatch"
     });
     
     frustumBuffer = graphics->createShaderBuffer(ShaderBufferCreateInfo{
         .sourceData = {
             .size = sizeof(Frustum) * numThreads.x * numThreads.y * numThreads.z,
             .data = nullptr,
+            .owner = Gfx::QueueType::COMPUTE
         },
         .numElements = numThreads.x * numThreads.y * numThreads.z,
         .dynamic = false,
+        .name = "FrustumBuffer"
     });
     
-    dispatchParamsSet = dispatchParamsLayout->allocateDescriptorSet();
+    Gfx::PDescriptorSet dispatchParamsSet = dispatchParamsLayout->allocateDescriptorSet();
     dispatchParamsSet->updateBuffer(0, frustumDispatchParamsBuffer);
     dispatchParamsSet->updateBuffer(1, frustumBuffer);
     dispatchParamsSet->writeChanges();

src/Engine/Graphics/Vulkan/Buffer.cpp

@@ -47,17 +47,20 @@ Buffer::Buffer(PGraphics graphics,
     {
         vmaCreateBuffer(graphics->getAllocator(), &info, &allocInfo, &buffers[i].buffer, &buffers[i].allocation, &buffers[i].info);
         vmaGetAllocationMemoryProperties(graphics->getAllocator(), buffers[i].allocation, &buffers[i].properties);
+        //std::cout << "Create buffer " << std::hex << (uint64)buffers[i].buffer << std::dec;
         if (!name.empty())
         {
-            VkDebugMarkerObjectNameInfoEXT nameInfo = {
-                .sType = VK_STRUCTURE_TYPE_DEBUG_MARKER_OBJECT_NAME_INFO_EXT,
+            VkDebugUtilsObjectNameInfoEXT nameInfo = {
+                .sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT,
                 .pNext = nullptr,
-                .objectType = VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_EXT,
-                .object = (uint64)buffers[i].buffer,
+                .objectType = VK_OBJECT_TYPE_BUFFER,
+                .objectHandle = (uint64)buffers[i].buffer,
                 .pObjectName = this->name.c_str()
             };
-            //graphics->vkDebugMarkerSetObjectNameEXT(&nameInfo);
+            graphics->vkSetDebugUtilsObjectNameEXT(&nameInfo);
+            //std::cout << ": " << name;
         }
+        //std::cout << std::endl;
     }
 }
 

src/Engine/Graphics/Vulkan/Graphics.cpp

@@ -293,9 +293,9 @@ void Graphics::vkCmdDrawMeshTasksEXT(VkCommandBuffer handle, uint32 groupX, uint
     cmdDrawMeshTasks(handle, groupX, groupY, groupZ);
 }
 
-void Graphics::vkDebugMarkerSetObjectNameEXT(VkDebugMarkerObjectNameInfoEXT* info)
+void Graphics::vkSetDebugUtilsObjectNameEXT(VkDebugUtilsObjectNameInfoEXT* info)
 {
-    VK_CHECK(cmdDebugMarkerSetObjectName(handle, info));
+    VK_CHECK(setDebugUtilsObjectName(handle, info));
 }
 
 
@@ -484,7 +484,7 @@ void Graphics::pickPhysicalDevice()
         {
             if (std::strcmp(VK_EXT_MESH_SHADER_EXTENSION_NAME, extensionProps[i].extensionName) == 0)
             {
-                meshShadingEnabled = true;
+                //meshShadingEnabled = true;
                 break;
             }
         }
@@ -637,6 +637,6 @@ void Graphics::createDevice(GraphicsInitializer initializer)
     queueMapping.graphicsFamily = queues[graphicsQueue]->getFamilyIndex();
     queueMapping.computeFamily = queues[computeQueue]->getFamilyIndex();
     queueMapping.transferFamily = queues[transferQueue]->getFamilyIndex();
-    cmdDebugMarkerSetObjectName = (PFN_vkDebugMarkerSetObjectNameEXT)vkGetInstanceProcAddr(instance, "vkDebugMarkerSetObjectNameEXT");
+    setDebugUtilsObjectName = (PFN_vkSetDebugUtilsObjectNameEXT)vkGetInstanceProcAddr(instance, "vkSetDebugUtilsObjectNameEXT");
 
 }

src/Engine/Graphics/Vulkan/Graphics.h

@@ -70,11 +70,11 @@ public:
     virtual void resolveTexture(Gfx::PTexture source, Gfx::PTexture destination) override;
 
     void vkCmdDrawMeshTasksEXT(VkCommandBuffer handle, uint32 groupX, uint32 groupY, uint32 groupZ);
-    void vkDebugMarkerSetObjectNameEXT(VkDebugMarkerObjectNameInfoEXT* info);
+    void vkSetDebugUtilsObjectNameEXT(VkDebugUtilsObjectNameInfoEXT* info);
 
 protected:
     PFN_vkCmdDrawMeshTasksEXT cmdDrawMeshTasks;
-    PFN_vkDebugMarkerSetObjectNameEXT cmdDebugMarkerSetObjectName;
+    PFN_vkSetDebugUtilsObjectNameEXT setDebugUtilsObjectName;
     Array<const char *> getRequiredExtensions();
     void initInstance(GraphicsInitializer initInfo);
     void setupDebugCallback();