diff --git a/external/slang b/external/slang deleted file mode 160000 index f83fe55..0000000 --- a/external/slang +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f83fe55a8c0859e2de832b71555b42a3630103a3 diff --git a/res/shaders/raytracing/Callable.slang b/res/shaders/raytracing/Callable.slang index c494d31..5969a2a 100644 --- a/res/shaders/raytracing/Callable.slang +++ b/res/shaders/raytracing/Callable.slang @@ -24,5 +24,5 @@ void callable(inout CallablePayload payload) // gamma correction result = result / (result + float3(1.0)); result = pow(result, float3(1.0/2.2)); - payload.color = result; + payload.color = brdf.baseColor; } \ No newline at end of file diff --git a/res/shaders/raytracing/ClosestHit.slang b/res/shaders/raytracing/ClosestHit.slang index 25606c5..5fdf226 100644 --- a/res/shaders/raytracing/ClosestHit.slang +++ b/res/shaders/raytracing/ClosestHit.slang @@ -10,34 +10,34 @@ import RayTracingData; [shader("closesthit")] void closestHit(inout RayPayload hitValue, in BuiltInTriangleIntersectionAttributes attr) { - const float3 barycentricCoords = float3(1.0f - attr.barycentrics.x - attr.barycentrics.y, attr.barycentrics.x, attr.barycentrics.y); + //const float3 barycentricCoords = float3(1.0f - attr.barycentrics.x - attr.barycentrics.y, attr.barycentrics.x, attr.barycentrics.y); - InstanceData inst = pScene.instances[InstanceID()]; - MeshData m = pScene.meshData[InstanceID()]; - - // offset into the index buffer - uint indexOffset = m.firstIndex; - // added to indices to reference correct part of global mesh pool - uint vertexOffset = pScene.meshletInfos[m.meshletOffset].indicesOffset; - - uint vertexIndex0 = vertexOffset + pRayTracingParams.indexBuffer[indexOffset + 3 * PrimitiveIndex() + 0]; - uint vertexIndex1 = vertexOffset + pRayTracingParams.indexBuffer[indexOffset + 3 * PrimitiveIndex() + 1]; - uint vertexIndex2 = vertexOffset + pRayTracingParams.indexBuffer[indexOffset + 3 * PrimitiveIndex() + 2]; - - VertexAttributes attr0 = pVertexData.getAttributes(vertexIndex0); - VertexAttributes attr1 = pVertexData.getAttributes(vertexIndex1); - VertexAttributes attr2 = pVertexData.getAttributes(vertexIndex2); - - FragmentParameter f0 = attr0.getParameter(inst.transformMatrix); - FragmentParameter f1 = attr1.getParameter(inst.transformMatrix); - FragmentParameter f2 = attr2.getParameter(inst.transformMatrix); - - FragmentParameter params = FragmentParameter.interpolate(f0, f1, f2, barycentricCoords); - - CallablePayload callable; - callable.params = params; - - CallShader(InstanceID(), callable); + //InstanceData inst = pScene.instances[InstanceID()]; + //MeshData m = pScene.meshData[InstanceID()]; +// + //// offset into the index buffer + //uint indexOffset = m.firstIndex; + //// added to indices to reference correct part of global mesh pool + //uint vertexOffset = pScene.meshletInfos[m.meshletOffset].indicesOffset; +// + //uint vertexIndex0 = vertexOffset + pRayTracingParams.indexBuffer[indexOffset + 3 * PrimitiveIndex() + 0]; + //uint vertexIndex1 = vertexOffset + pRayTracingParams.indexBuffer[indexOffset + 3 * PrimitiveIndex() + 1]; + //uint vertexIndex2 = vertexOffset + pRayTracingParams.indexBuffer[indexOffset + 3 * PrimitiveIndex() + 2]; +// + //VertexAttributes attr0 = pVertexData.getAttributes(vertexIndex0); + //VertexAttributes attr1 = pVertexData.getAttributes(vertexIndex1); + //VertexAttributes attr2 = pVertexData.getAttributes(vertexIndex2); +// + //FragmentParameter f0 = attr0.getParameter(inst.transformMatrix); + //FragmentParameter f1 = attr1.getParameter(inst.transformMatrix); + //FragmentParameter f2 = attr2.getParameter(inst.transformMatrix); +// + //FragmentParameter params = FragmentParameter.interpolate(f0, f1, f2, barycentricCoords); +// + //CallablePayload callable; + //callable.params = params; +// + //CallShader(InstanceID(), callable); hitValue.color = float3(1, 0, 0); } \ No newline at end of file diff --git a/res/shaders/raytracing/RayGen.slang b/res/shaders/raytracing/RayGen.slang index 85ff154..2b75b51 100644 --- a/res/shaders/raytracing/RayGen.slang +++ b/res/shaders/raytracing/RayGen.slang @@ -25,10 +25,7 @@ void raygen() desc.TMin = tmin; desc.TMax = tmax; - pRayTracingParams.origins[DispatchRaysIndex().x + DispatchRaysDimensions().x * DispatchRaysIndex().y] = origin.xyz; - pRayTracingParams.rayDirections[DispatchRaysIndex().x + DispatchRaysDimensions().x * DispatchRaysIndex().y] = direction.xyz; - - TraceRay(pRayTracingParams.scene, 0, 0xff, 0, 1, 0, desc, payload); + TraceRay(pRayTracingParams.scene, 0, 0xff, 0, 0, 0, desc, payload); pRayTracingParams.image[DispatchRaysIndex().xy] = float4(payload.color, 1.0f); } diff --git a/res/shaders/raytracing/RayTracingData.slang b/res/shaders/raytracing/RayTracingData.slang index 5bd865e..0ab91bb 100644 --- a/res/shaders/raytracing/RayTracingData.slang +++ b/res/shaders/raytracing/RayTracingData.slang @@ -5,8 +5,6 @@ struct RayTracingParams RaytracingAccelerationStructure scene; RWTexture2D image; StructuredBuffer indexBuffer; - RWStructuredBuffer rayDirections; - RWStructuredBuffer origins; }; layout(set=5) ParameterBlock pRayTracingParams; diff --git a/src/Engine/Graphics/RenderPass/RayTracingPass.cpp b/src/Engine/Graphics/RenderPass/RayTracingPass.cpp index 788a8c9..85c41e5 100644 --- a/src/Engine/Graphics/RenderPass/RayTracingPass.cpp +++ b/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() {} diff --git a/src/Engine/Graphics/RenderPass/RayTracingPass.h b/src/Engine/Graphics/RenderPass/RayTracingPass.h index b6caa45..e2f64a2 100644 --- a/src/Engine/Graphics/RenderPass/RayTracingPass.h +++ b/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 \ No newline at end of file diff --git a/src/Engine/Graphics/Vulkan/Graphics.cpp b/src/Engine/Graphics/Vulkan/Graphics.cpp index 8fbebf4..c54e9b2 100644 --- a/src/Engine/Graphics/Vulkan/Graphics.cpp +++ b/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, diff --git a/src/Engine/Graphics/Vulkan/Texture.cpp b/src/Engine/Graphics/Vulkan/Texture.cpp index e083371..88223e9 100644 --- a/src/Engine/Graphics/Vulkan/Texture.cpp +++ b/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)); } diff --git a/src/Engine/Scene/LightEnvironment.cpp b/src/Engine/Scene/LightEnvironment.cpp index 66caebb..2076a54 100644 --- a/src/Engine/Scene/LightEnvironment.cpp +++ b/src/Engine/Scene/LightEnvironment.cpp @@ -61,13 +61,16 @@ void LightEnvironment::addPointLight(Component::PointLight pointLight) { points. void LightEnvironment::commit() { lightEnvBuffer->pipelineBarrier(Gfx::SE_ACCESS_UNIFORM_READ_BIT | Gfx::SE_ACCESS_TRANSFER_WRITE_BIT, - Gfx::SE_PIPELINE_STAGE_ALL_COMMANDS_BIT, + Gfx::SE_PIPELINE_STAGE_TRANSFER_BIT | Gfx::SE_PIPELINE_STAGE_FRAGMENT_SHADER_BIT | + Gfx::SE_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR, Gfx::SE_ACCESS_TRANSFER_WRITE_BIT, Gfx::SE_PIPELINE_STAGE_TRANSFER_BIT); pointLights->pipelineBarrier(Gfx::SE_ACCESS_SHADER_READ_BIT | Gfx::SE_ACCESS_TRANSFER_WRITE_BIT, - Gfx::SE_PIPELINE_STAGE_ALL_COMMANDS_BIT, Gfx::SE_ACCESS_TRANSFER_WRITE_BIT, - Gfx::SE_PIPELINE_STAGE_TRANSFER_BIT); + Gfx::SE_PIPELINE_STAGE_TRANSFER_BIT | Gfx::SE_PIPELINE_STAGE_FRAGMENT_SHADER_BIT | + Gfx::SE_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR, + Gfx::SE_ACCESS_TRANSFER_WRITE_BIT, Gfx::SE_PIPELINE_STAGE_TRANSFER_BIT); directionalLights->pipelineBarrier(Gfx::SE_ACCESS_SHADER_READ_BIT | Gfx::SE_ACCESS_TRANSFER_WRITE_BIT, - Gfx::SE_PIPELINE_STAGE_ALL_COMMANDS_BIT, + Gfx::SE_PIPELINE_STAGE_TRANSFER_BIT | Gfx::SE_PIPELINE_STAGE_FRAGMENT_SHADER_BIT | + Gfx::SE_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR, Gfx::SE_ACCESS_TRANSFER_WRITE_BIT, Gfx::SE_PIPELINE_STAGE_TRANSFER_BIT); lightEnv.numDirectionalLights = dirs.size(); lightEnv.numPointLights = points.size(); @@ -86,16 +89,26 @@ void LightEnvironment::commit() { }); pointLights->rotateBuffer(sizeof(Component::PointLight) * points.size()); pointLights->updateContents({ - .sourceData = {.size = sizeof(Component::PointLight) * points.size(), .data = (uint8*)points.data()}, + .sourceData = + { + .size = sizeof(Component::PointLight) * points.size(), + .data = (uint8*)points.data(), + }, .numElements = points.size(), }); - lightEnvBuffer->pipelineBarrier(Gfx::SE_ACCESS_TRANSFER_WRITE_BIT, Gfx::SE_PIPELINE_STAGE_TRANSFER_BIT, Gfx::SE_ACCESS_UNIFORM_READ_BIT, - Gfx::SE_PIPELINE_STAGE_ALL_COMMANDS_BIT); - pointLights->pipelineBarrier(Gfx::SE_ACCESS_TRANSFER_WRITE_BIT, Gfx::SE_PIPELINE_STAGE_TRANSFER_BIT, Gfx::SE_ACCESS_SHADER_READ_BIT, - Gfx::SE_PIPELINE_STAGE_ALL_COMMANDS_BIT); + lightEnvBuffer->pipelineBarrier(Gfx::SE_ACCESS_TRANSFER_WRITE_BIT, Gfx::SE_PIPELINE_STAGE_TRANSFER_BIT, + Gfx::SE_ACCESS_UNIFORM_READ_BIT | Gfx::SE_ACCESS_TRANSFER_WRITE_BIT, + Gfx::SE_PIPELINE_STAGE_TRANSFER_BIT | Gfx::SE_PIPELINE_STAGE_FRAGMENT_SHADER_BIT | + Gfx::SE_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR); + pointLights->pipelineBarrier(Gfx::SE_ACCESS_TRANSFER_WRITE_BIT, Gfx::SE_PIPELINE_STAGE_TRANSFER_BIT, + Gfx::SE_ACCESS_SHADER_READ_BIT | Gfx::SE_ACCESS_TRANSFER_WRITE_BIT, + Gfx::SE_PIPELINE_STAGE_TRANSFER_BIT | Gfx::SE_PIPELINE_STAGE_FRAGMENT_SHADER_BIT | + Gfx::SE_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR); directionalLights->pipelineBarrier(Gfx::SE_ACCESS_TRANSFER_WRITE_BIT, Gfx::SE_PIPELINE_STAGE_TRANSFER_BIT, - Gfx::SE_ACCESS_SHADER_READ_BIT, Gfx::SE_PIPELINE_STAGE_ALL_COMMANDS_BIT); + Gfx::SE_ACCESS_SHADER_READ_BIT | Gfx::SE_ACCESS_TRANSFER_WRITE_BIT, + Gfx::SE_PIPELINE_STAGE_TRANSFER_BIT | Gfx::SE_PIPELINE_STAGE_FRAGMENT_SHADER_BIT | + Gfx::SE_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR); set->updateBuffer(0, lightEnvBuffer); set->updateBuffer(1, directionalLights); set->updateBuffer(2, pointLights);