From 2480529dbcf0fcec2c532cafe06c87fc7a8ef62e Mon Sep 17 00:00:00 2001 From: Dynamitos Date: Tue, 20 Feb 2024 21:07:17 +0100 Subject: [PATCH] Lighting is broken again --- res/shaders/ComputeFrustums.slang | 3 -- res/shaders/LightCulling.slang | 6 ++-- res/shaders/MeshletBasePass.slang | 3 -- res/shaders/lib/AABB.slang | 8 ++++-- res/shaders/lib/Common.slang | 5 ---- res/shaders/lib/LightEnv.slang | 28 +++++++++---------- res/shaders/lib/MaterialParameter.slang | 6 ++-- .../Graphics/RenderPass/LightCullingPass.cpp | 21 ++++++++------ src/Engine/Graphics/Vulkan/Buffer.cpp | 13 +++++---- src/Engine/Graphics/Vulkan/Graphics.cpp | 8 +++--- src/Engine/Graphics/Vulkan/Graphics.h | 4 +-- 11 files changed, 52 insertions(+), 53 deletions(-) diff --git a/res/shaders/ComputeFrustums.slang b/res/shaders/ComputeFrustums.slang index 2ade0a0..1c9c27f 100644 --- a/res/shaders/ComputeFrustums.slang +++ b/res/shaders/ComputeFrustums.slang @@ -26,9 +26,6 @@ void computeFrustums(ComputeShaderInput in) topLeft + (in.dispatchThreadID.x + 1) * xStep + (in.dispatchThreadID.y + 1) * yStep }; Frustum frustum; - frustum.basePlane.n = float3(0, 0, -1); - frustum.basePlane.d = 0; - frustum.sides[0] = computePlane(origin, corners[0], corners[2]); frustum.sides[1] = computePlane(origin, corners[3], corners[1]); frustum.sides[2] = computePlane(origin, corners[1], corners[0]); diff --git a/res/shaders/LightCulling.slang b/res/shaders/LightCulling.slang index d56001c..81950b0 100644 --- a/res/shaders/LightCulling.slang +++ b/res/shaders/LightCulling.slang @@ -98,12 +98,12 @@ void cullLights(ComputeShaderInput in) for ( uint i = in.groupIndex; i < pLightEnv.numPointLights; i += BLOCK_SIZE * BLOCK_SIZE ) { PointLight light = pLightEnv.pointLights[i]; - light.updatePosition(); + float3 lightClip = light.getClipPosition(); //TODO: why doesn't this check go through? - if(light.insideFrustum(groupFrustum, nearClipVS, maxDepthVS)) + if(light.insideFrustum(groupFrustum, lightClip, nearClipVS, maxDepthVS)) { tAppendLight(i); - if(!light.insidePlane(minPlane)) + if(!light.insidePlane(minPlane, lightClip)) { oAppendLight(i); } diff --git a/res/shaders/MeshletBasePass.slang b/res/shaders/MeshletBasePass.slang index 7cf3122..66c18d1 100644 --- a/res/shaders/MeshletBasePass.slang +++ b/res/shaders/MeshletBasePass.slang @@ -39,9 +39,6 @@ void taskMain( // Bottom viewFrustum.sides[3].n = float3(0, 1, 0); viewFrustum.sides[3].d = -1; - // Base - viewFrustum.basePlane.n = float3(0, 0, -1); - viewFrustum.basePlane.d = 0; } GroupMemoryBarrierWithGroupSync(); MeshData mesh = pScene.meshData[groupID]; diff --git a/res/shaders/lib/AABB.slang b/res/shaders/lib/AABB.slang index eba17d4..e9ee46d 100644 --- a/res/shaders/lib/AABB.slang +++ b/res/shaders/lib/AABB.slang @@ -19,9 +19,13 @@ struct AABB corners[7] = mul(transform, float4(max.x, max.y, max.z, 1.0f)); for(int i = 0; i < 8; ++i) { - if(frustum.pointInside(corners[i].xyz / corners[i].w)) + float3 adjusted = corners[i].xyz / corners[i].w; + if(adjusted.z > 0) { - return true; + if(frustum.pointInside(adjusted)) + { + return true; + } } } return false; diff --git a/res/shaders/lib/Common.slang b/res/shaders/lib/Common.slang index 7048fb7..71f1bd6 100644 --- a/res/shaders/lib/Common.slang +++ b/res/shaders/lib/Common.slang @@ -36,13 +36,8 @@ struct Plane struct Frustum { Plane sides[4]; - Plane basePlane; bool pointInside(float3 point) { - if (!basePlane.pointInside(point)) - { - return false; - } for(int p = 0; p < 4; ++p) { if(!sides[p].pointInside(point)) diff --git a/res/shaders/lib/LightEnv.slang b/res/shaders/lib/LightEnv.slang index 337e84a..45a3e0f 100644 --- a/res/shaders/lib/LightEnv.slang +++ b/res/shaders/lib/LightEnv.slang @@ -23,7 +23,6 @@ struct PointLight : ILightEnv { float4 position_WS; float4 colorRange; - float4 position_CS; float3 illuminate(LightingParameter params, B brdf) { @@ -33,33 +32,32 @@ struct PointLight : ILightEnv float illuminance = max(1 - d / colorRange.w, 0); return illuminance * brdf.evaluate(params.tbn, params.viewDir_TS, normalize(lightDir_TS), colorRange.xyz); } - void updatePosition() + float3 getClipPosition() { - position_CS = mul(pViewParams.projectionMatrix, mul(pViewParams.viewMatrix, position_WS)); + float4 position_CS = mul(pViewParams.projectionMatrix, mul(pViewParams.viewMatrix, position_WS)); + return position_CS.xyz / position_CS.w; } - bool insidePlane(Plane plane) + bool insidePlane(Plane plane, float3 position_CS) { - float3 edge_CS = position_CS + plane.n * colorRange.w; - return plane.pointInside(edge_CS); + return dot(plane.n, position_CS) - plane.d < -colorRange.w; } - bool insideFrustum(Frustum frustum, float nearClipVS, float maxDepthVS) + bool insideFrustum(Frustum frustum, float3 position_CS, float minDepth, float maxDepth) { - float3 center_CS = clipPos.xyz / clipPos.w; - if(insidePlane(frustum.basePlane, center_CS)) + bool result = true; + if(position_CS.z - colorRange.w > minDepth || position_CS.z + colorRange.w < maxDepth) { - return true; + result = false; } - uint result = 0; - for(int i = 0; i < 4; ++i) + for(int i = 0; i < 4 && result; ++i) { - if(insidePlane(frustum.sides[i], center_CS)) + if(insidePlane(frustum.sides[i], position_CS)) { - result++; + result = false; } } - return result > 0; + return result; } }; diff --git a/res/shaders/lib/MaterialParameter.slang b/res/shaders/lib/MaterialParameter.slang index 9cc5208..3fc8f2b 100644 --- a/res/shaders/lib/MaterialParameter.slang +++ b/res/shaders/lib/MaterialParameter.slang @@ -59,9 +59,9 @@ struct VertexAttributes float4 worldPos = mul(transformMatrix, modelPos); float4 viewPos = mul(pViewParams.viewMatrix, worldPos); float4 clipPos = mul(pViewParams.projectionMatrix, viewPos); - float3 tangent_WS = mul(float3x3(transformMatrix), normalize(tangent_MS)); - float3 biTangent_WS = mul(float3x3(transformMatrix), normalize(biTangent_MS)); - float3 normal_WS = mul(float3x3(transformMatrix), normalize(normal_MS)); + float3 tangent_WS = mul(float3x3(transformMatrix), tangent_MS); + float3 biTangent_WS = mul(float3x3(transformMatrix), biTangent_MS); + float3 normal_WS = mul(float3x3(transformMatrix), normal_MS); FragmentParameter result; result.viewDir_WS = pViewParams.cameraPos_WS.xyz - worldPos.xyz; result.normal_WS = normal_WS; diff --git a/src/Engine/Graphics/RenderPass/LightCullingPass.cpp b/src/Engine/Graphics/RenderPass/LightCullingPass.cpp index 57f4dba..e3b0f10 100644 --- a/src/Engine/Graphics/RenderPass/LightCullingPass.cpp +++ b/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 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(); diff --git a/src/Engine/Graphics/Vulkan/Buffer.cpp b/src/Engine/Graphics/Vulkan/Buffer.cpp index 9618b71..375813b 100644 --- a/src/Engine/Graphics/Vulkan/Buffer.cpp +++ b/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; } } diff --git a/src/Engine/Graphics/Vulkan/Graphics.cpp b/src/Engine/Graphics/Vulkan/Graphics.cpp index b59e26f..89a1d11 100644 --- a/src/Engine/Graphics/Vulkan/Graphics.cpp +++ b/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"); } diff --git a/src/Engine/Graphics/Vulkan/Graphics.h b/src/Engine/Graphics/Vulkan/Graphics.h index de63157..675ffff 100644 --- a/src/Engine/Graphics/Vulkan/Graphics.h +++ b/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 getRequiredExtensions(); void initInstance(GraphicsInitializer initInfo); void setupDebugCallback();