Dynamitos/Seele
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More rt changes

Browse Source
This commit is contained in:
Dynamitos
2024-07-13 16:22:56 +02:00
parent 3463ecd7b9
commit 42d98d7233
10 changed files with 55 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
external/slang
Vendored
-1
Submodule external/slang deleted from f83fe55a8c
res/shaders/raytracing/Callable.slang
+1 -1
View File
@@ -24,5 +24,5 @@ void callable(inout CallablePayload payload)
// gamma correction // gamma correction
result = result / (result + float3(1.0)); result = result / (result + float3(1.0));
result = pow(result, float3(1.0/2.2)); result = pow(result, float3(1.0/2.2));
payload.color = result; payload.color = brdf.baseColor;
} }
res/shaders/raytracing/ClosestHit.slang
+27 -27
View File
@@ -10,34 +10,34 @@ import RayTracingData;
[shader("closesthit")] [shader("closesthit")]
void closestHit(inout RayPayload hitValue, in BuiltInTriangleIntersectionAttributes attr) 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()]; //InstanceData inst = pScene.instances[InstanceID()];
MeshData m = pScene.meshData[InstanceID()]; //MeshData m = pScene.meshData[InstanceID()];
//
// offset into the index buffer //// offset into the index buffer
uint indexOffset = m.firstIndex; //uint indexOffset = m.firstIndex;
// added to indices to reference correct part of global mesh pool //// added to indices to reference correct part of global mesh pool
uint vertexOffset = pScene.meshletInfos[m.meshletOffset].indicesOffset; //uint vertexOffset = pScene.meshletInfos[m.meshletOffset].indicesOffset;
//
uint vertexIndex0 = vertexOffset + pRayTracingParams.indexBuffer[indexOffset + 3 * PrimitiveIndex() + 0]; //uint vertexIndex0 = vertexOffset + pRayTracingParams.indexBuffer[indexOffset + 3 * PrimitiveIndex() + 0];
uint vertexIndex1 = vertexOffset + pRayTracingParams.indexBuffer[indexOffset + 3 * PrimitiveIndex() + 1]; //uint vertexIndex1 = vertexOffset + pRayTracingParams.indexBuffer[indexOffset + 3 * PrimitiveIndex() + 1];
uint vertexIndex2 = vertexOffset + pRayTracingParams.indexBuffer[indexOffset + 3 * PrimitiveIndex() + 2]; //uint vertexIndex2 = vertexOffset + pRayTracingParams.indexBuffer[indexOffset + 3 * PrimitiveIndex() + 2];
//
VertexAttributes attr0 = pVertexData.getAttributes(vertexIndex0); //VertexAttributes attr0 = pVertexData.getAttributes(vertexIndex0);
VertexAttributes attr1 = pVertexData.getAttributes(vertexIndex1); //VertexAttributes attr1 = pVertexData.getAttributes(vertexIndex1);
VertexAttributes attr2 = pVertexData.getAttributes(vertexIndex2); //VertexAttributes attr2 = pVertexData.getAttributes(vertexIndex2);
//
FragmentParameter f0 = attr0.getParameter(inst.transformMatrix); //FragmentParameter f0 = attr0.getParameter(inst.transformMatrix);
FragmentParameter f1 = attr1.getParameter(inst.transformMatrix); //FragmentParameter f1 = attr1.getParameter(inst.transformMatrix);
FragmentParameter f2 = attr2.getParameter(inst.transformMatrix); //FragmentParameter f2 = attr2.getParameter(inst.transformMatrix);
//
FragmentParameter params = FragmentParameter.interpolate(f0, f1, f2, barycentricCoords); //FragmentParameter params = FragmentParameter.interpolate(f0, f1, f2, barycentricCoords);
//
CallablePayload callable; //CallablePayload callable;
callable.params = params; //callable.params = params;
//
CallShader(InstanceID(), callable); //CallShader(InstanceID(), callable);
hitValue.color = float3(1, 0, 0); hitValue.color = float3(1, 0, 0);
} }
res/shaders/raytracing/RayGen.slang
+1 -4
View File
@@ -25,10 +25,7 @@ void raygen()
desc.TMin = tmin; desc.TMin = tmin;
desc.TMax = tmax; desc.TMax = tmax;
pRayTracingParams.origins[DispatchRaysIndex().x + DispatchRaysDimensions().x * DispatchRaysIndex().y] = origin.xyz; TraceRay(pRayTracingParams.scene, 0, 0xff, 0, 0, 0, desc, payload);
pRayTracingParams.rayDirections[DispatchRaysIndex().x + DispatchRaysDimensions().x * DispatchRaysIndex().y] = direction.xyz;
TraceRay(pRayTracingParams.scene, 0, 0xff, 0, 1, 0, desc, payload);
pRayTracingParams.image[DispatchRaysIndex().xy] = float4(payload.color, 1.0f); pRayTracingParams.image[DispatchRaysIndex().xy] = float4(payload.color, 1.0f);
} }
res/shaders/raytracing/RayTracingData.slang
-2
View File
@@ -5,8 +5,6 @@ struct RayTracingParams
RaytracingAccelerationStructure scene; RaytracingAccelerationStructure scene;
RWTexture2D<float4> image; RWTexture2D<float4> image;
StructuredBuffer<uint> indexBuffer; StructuredBuffer<uint> indexBuffer;
RWStructuredBuffer<float3> rayDirections;
RWStructuredBuffer<float3> origins;
}; };
layout(set=5) layout(set=5)
ParameterBlock<RayTracingParams> pRayTracingParams; ParameterBlock<RayTracingParams> pRayTracingParams;
src/Engine/Graphics/RenderPass/RayTracingPass.cpp
-28
View File
@@ -20,16 +20,6 @@ RayTracingPass::RayTracingPass(Gfx::PGraphics graphics, PScene scene) : RenderPa
.binding = 2, .binding = 2,
.descriptorType = Gfx::SE_DESCRIPTOR_TYPE_STORAGE_BUFFER, .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(); paramsLayout->create();
pipelineLayout = graphics->createPipelineLayout("RayTracing"); pipelineLayout = graphics->createPipelineLayout("RayTracing");
pipelineLayout->addDescriptorLayout(viewParamsLayout); pipelineLayout->addDescriptorLayout(viewParamsLayout);
@@ -92,8 +82,6 @@ void RayTracingPass::render() {
desc->updateAccelerationStructure(0, tlas); desc->updateAccelerationStructure(0, tlas);
desc->updateTexture(1, Gfx::PTexture2D(texture)); desc->updateTexture(1, Gfx::PTexture2D(texture));
desc->updateBuffer(2, StaticMeshVertexData::getInstance()->getIndexBuffer()); desc->updateBuffer(2, StaticMeshVertexData::getInstance()->getIndexBuffer());
desc->updateBuffer(3, directionBuffer);
desc->updateBuffer(4, originBuffer);
desc->writeChanges(); desc->writeChanges();
Gfx::PRayTracingPipeline pipeline = graphics->createRayTracingPipeline(Gfx::RayTracingPipelineCreateInfo{ Gfx::PRayTracingPipeline pipeline = graphics->createRayTracingPipeline(Gfx::RayTracingPipelineCreateInfo{
@@ -146,22 +134,6 @@ void RayTracingPass::publishOutputs() {
closestHit = graphics->createClosestHitShader({1}); closestHit = graphics->createClosestHitShader({1});
miss = graphics->createMissShader({2}); miss = graphics->createMissShader({2});
pipelineLayout->create(); 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() {} void RayTracingPass::createRenderPass() {}
src/Engine/Graphics/RenderPass/RayTracingPass.h
-2
View File
@@ -21,7 +21,5 @@ class RayTracingPass : public RenderPass {
Gfx::ORayGenShader rayGen; Gfx::ORayGenShader rayGen;
Gfx::OClosestHitShader closestHit; Gfx::OClosestHitShader closestHit;
Gfx::OMissShader miss; Gfx::OMissShader miss;
Gfx::OShaderBuffer directionBuffer;
Gfx::OShaderBuffer originBuffer;
}; };
} // namespace Seele } // namespace Seele
src/Engine/Graphics/Vulkan/Graphics.cpp
+1 -5
View File
@@ -644,9 +644,6 @@ void Graphics::initInstance(GraphicsInitializer initInfo) {
} }
#ifdef __APPLE__ #ifdef __APPLE__
extensions.add("VK_KHR_portability_enumeration"); extensions.add("VK_KHR_portability_enumeration");
#endif
#if ENABLE_VALIDATION
initInfo.layers.add("VK_LAYER_KHRONOS_validation");
#endif #endif
VkInstanceCreateInfo info = { VkInstanceCreateInfo info = {
.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, .sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO,
@@ -853,10 +850,9 @@ void Graphics::createDevice(GraphicsInitializer initializer) {
#ifdef __APPLE__ #ifdef __APPLE__
initializer.deviceExtensions.add("VK_KHR_portability_subset"); initializer.deviceExtensions.add("VK_KHR_portability_subset");
#endif #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_ACCELERATION_STRUCTURE_EXTENSION_NAME);
initializer.deviceExtensions.add(VK_KHR_RAY_TRACING_PIPELINE_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 = { VkDeviceCreateInfo deviceInfo = {
.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO, .sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO,
.pNext = &features, .pNext = &features,
src/Engine/Graphics/Vulkan/Texture.cpp
+2 -2
View File
@@ -88,7 +88,7 @@ TextureHandle::TextureHandle(PGraphics graphics, VkImageViewType viewType, const
const DataSource& sourceData = createInfo.sourceData; const DataSource& sourceData = createInfo.sourceData;
if (sourceData.size > 0) { if (sourceData.size > 0) {
changeLayout(Gfx::SE_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_ACCESS_NONE, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, 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; void* data;
VkBufferCreateInfo stagingInfo = { VkBufferCreateInfo stagingInfo = {
.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO, .sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,
@@ -134,7 +134,7 @@ TextureHandle::TextureHandle(PGraphics graphics, VkImageViewType viewType, const
commandPool->getCommands()->bindResource(PBufferAllocation(stagingAlloc)); commandPool->getCommands()->bindResource(PBufferAllocation(stagingAlloc));
generateMipmaps(); generateMipmaps();
// When loading a texture from a file, we will almost always use it as a texture map for fragment shaders // 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); VK_ACCESS_SHADER_READ_BIT, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT);
graphics->getDestructionManager()->queueResourceForDestruction(std::move(stagingAlloc)); graphics->getDestructionManager()->queueResourceForDestruction(std::move(stagingAlloc));
} }
src/Engine/Scene/LightEnvironment.cpp
+23 -10
View File
@@ -61,13 +61,16 @@ void LightEnvironment::addPointLight(Component::PointLight pointLight) { points.
void LightEnvironment::commit() { void LightEnvironment::commit() {
lightEnvBuffer->pipelineBarrier(Gfx::SE_ACCESS_UNIFORM_READ_BIT | Gfx::SE_ACCESS_TRANSFER_WRITE_BIT, 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); 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, 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_FRAGMENT_SHADER_BIT |
Gfx::SE_PIPELINE_STAGE_TRANSFER_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, 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); Gfx::SE_ACCESS_TRANSFER_WRITE_BIT, Gfx::SE_PIPELINE_STAGE_TRANSFER_BIT);
lightEnv.numDirectionalLights = dirs.size(); lightEnv.numDirectionalLights = dirs.size();
lightEnv.numPointLights = points.size(); lightEnv.numPointLights = points.size();
@@ -86,16 +89,26 @@ void LightEnvironment::commit() {
}); });
pointLights->rotateBuffer(sizeof(Component::PointLight) * points.size()); pointLights->rotateBuffer(sizeof(Component::PointLight) * points.size());
pointLights->updateContents({ 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(), .numElements = points.size(),
}); });
lightEnvBuffer->pipelineBarrier(Gfx::SE_ACCESS_TRANSFER_WRITE_BIT, Gfx::SE_PIPELINE_STAGE_TRANSFER_BIT, Gfx::SE_ACCESS_UNIFORM_READ_BIT, lightEnvBuffer->pipelineBarrier(Gfx::SE_ACCESS_TRANSFER_WRITE_BIT, Gfx::SE_PIPELINE_STAGE_TRANSFER_BIT,
Gfx::SE_PIPELINE_STAGE_ALL_COMMANDS_BIT); Gfx::SE_ACCESS_UNIFORM_READ_BIT | Gfx::SE_ACCESS_TRANSFER_WRITE_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_TRANSFER_BIT | Gfx::SE_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |
Gfx::SE_PIPELINE_STAGE_ALL_COMMANDS_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, 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(0, lightEnvBuffer);
set->updateBuffer(1, directionalLights); set->updateBuffer(1, directionalLights);
set->updateBuffer(2, pointLights); set->updateBuffer(2, pointLights);