zdoom/zdray
0
0
Fork 0
mirror of https://github.com/ZDoom/ZDRay.git synced 2025-01-25 00:51:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Align the uniforms as the Nvidia 10 series requires that

Browse source
This commit is contained in:
Magnus Norddahl 2021-11-13 01:06:36 +01:00
parent fc56a552fd
commit 5d0fe12221
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/lightmap/gpuraytracer.cpp
View file

@ -222,7 +222,7 @@ void GPURaytracer::UploadTasks(const TraceTask* tasks, size_t size)
void GPURaytracer::BeginTracing() void GPURaytracer::BeginTracing()
{ {
uniformsIndex = 0; uniformsIndex = 0;
mappedUniforms = (Uniforms*)uniformTransferBuffer->Map(0, uniformStructs * sizeof(Uniforms)); mappedUniforms = (uint8_t*)uniformTransferBuffer->Map(0, uniformStructs * uniformStructStride);
cmdbuffer->copyBuffer(uniformTransferBuffer.get(), uniformBuffer.get()); cmdbuffer->copyBuffer(uniformTransferBuffer.get(), uniformBuffer.get());
cmdbuffer->bindPipeline(VK_PIPELINE_BIND_POINT_RAY_TRACING_KHR, pipeline.get()); cmdbuffer->bindPipeline(VK_PIPELINE_BIND_POINT_RAY_TRACING_KHR, pipeline.get());
@ -236,7 +236,7 @@ void GPURaytracer::RunTrace(const Uniforms& uniforms, const VkStridedDeviceAddre
BeginTracing(); BeginTracing();
} }
mappedUniforms[uniformsIndex] = uniforms; *reinterpret_cast<Uniforms*>(mappedUniforms + uniformStructStride * uniformsIndex) = uniforms;
if (uniformsIndex == 0) if (uniformsIndex == 0)
{ {
@ -252,7 +252,7 @@ void GPURaytracer::RunTrace(const Uniforms& uniforms, const VkStridedDeviceAddre
barrier.execute(cmdbuffer.get(), VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR, VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR); barrier.execute(cmdbuffer.get(), VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR, VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR);
} }
uint32_t offset = (uint32_t)(uniformsIndex * sizeof(Uniforms)); uint32_t offset = (uint32_t)(uniformsIndex * uniformStructStride);
cmdbuffer->bindDescriptorSet(VK_PIPELINE_BIND_POINT_RAY_TRACING_KHR, pipelineLayout.get(), 0, descriptorSet.get(), 1, &offset); cmdbuffer->bindDescriptorSet(VK_PIPELINE_BIND_POINT_RAY_TRACING_KHR, pipelineLayout.get(), 0, descriptorSet.get(), 1, &offset);
cmdbuffer->traceRays(&rgenShader, &missRegion, &hitRegion, &callRegion, rayTraceImageSize, rayTraceImageSize, 1); cmdbuffer->traceRays(&rgenShader, &missRegion, &hitRegion, &callRegion, rayTraceImageSize, rayTraceImageSize, 1);
@ -809,15 +809,18 @@ void GPURaytracer::CreatePipeline()
void GPURaytracer::CreateDescriptorSet() void GPURaytracer::CreateDescriptorSet()
{ {
VkDeviceSize align = device->physicalDevice.properties.limits.minUniformBufferOffsetAlignment;
uniformStructStride = (sizeof(Uniforms) + align - 1) / align * align;
BufferBuilder uniformbuilder; BufferBuilder uniformbuilder;
uniformbuilder.setUsage(VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT); uniformbuilder.setUsage(VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT);
uniformbuilder.setSize(uniformStructs * sizeof(Uniforms)); uniformbuilder.setSize(uniformStructs * uniformStructStride);
uniformBuffer = uniformbuilder.create(device.get()); uniformBuffer = uniformbuilder.create(device.get());
uniformBuffer->SetDebugName("uniformBuffer"); uniformBuffer->SetDebugName("uniformBuffer");
BufferBuilder uniformtransferbuilder; BufferBuilder uniformtransferbuilder;
uniformtransferbuilder.setUsage(VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VMA_MEMORY_USAGE_CPU_TO_GPU); uniformtransferbuilder.setUsage(VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VMA_MEMORY_USAGE_CPU_TO_GPU);
uniformtransferbuilder.setSize(uniformStructs * sizeof(Uniforms)); uniformtransferbuilder.setSize(uniformStructs * uniformStructStride);
uniformTransferBuffer = uniformtransferbuilder.create(device.get()); uniformTransferBuffer = uniformtransferbuilder.create(device.get());
uniformTransferBuffer->SetDebugName("uniformTransferBuffer"); uniformTransferBuffer->SetDebugName("uniformTransferBuffer");

5
src/lightmap/gpuraytracer.h
View file

@ -83,13 +83,14 @@ private:
const int coverageSampleCount = 256; const int coverageSampleCount = 256;
const int bounceSampleCount = 2048; const int bounceSampleCount = 2048;
const int uniformStructs = 256;
int rayTraceImageSize = 1024; int rayTraceImageSize = 1024;
LevelMesh* mesh = nullptr; LevelMesh* mesh = nullptr;
Uniforms* mappedUniforms = nullptr; uint8_t* mappedUniforms = nullptr;
int uniformsIndex = 0; int uniformsIndex = 0;
int uniformStructs = 256;
VkDeviceSize uniformStructStride = sizeof(Uniforms);
std::unique_ptr<VulkanDevice> device; std::unique_ptr<VulkanDevice> device;