claude_code/procedural-3d-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed buffer sizes and recompiled shaders

Browse source 
Validation is clean now
Fixes #1017
This commit is contained in:
Sascha Willems 2023-08-04 19:49:42 +02:00
parent cc89bdb4a5
commit fc27e4d98d
4 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
examples/raytracingsbtdata/raytracingsbtdata.cpp
View file

@ -5,7 +5,7 @@
* *
* Example by Nate Morrical (https://github.com/natevm) * Example by Nate Morrical (https://github.com/natevm)
* *
* Copyright (C) 2019-2020 by Sascha Willems - www.saschawillems.de * Copyright (C) 2019-2023 by Sascha Willems - www.saschawillems.de
* *
* This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
*/ */
@ -538,9 +538,10 @@ public:
// We allocate space for the handle (which is like lambda function pointers to call in the ray tracing pipeline) // We allocate space for the handle (which is like lambda function pointers to call in the ray tracing pipeline)
// as well as the data to pass to those functions (which act as the variables being "captured" by those lambda functions) // as well as the data to pass to those functions (which act as the variables being "captured" by those lambda functions)
VK_CHECK_RESULT(vulkanDevice->createBuffer(bufferUsageFlags, memoryUsageFlags, &raygenShaderBindingTable, handleSize + sizeof(float) * 3)); uint32_t bufferSize = vks::tools::alignedSize(handleSize + 3 * sizeof(float), rayTracingPipelineProperties.shaderGroupBaseAlignment);
VK_CHECK_RESULT(vulkanDevice->createBuffer(bufferUsageFlags, memoryUsageFlags, &missShaderBindingTable, handleSize + sizeof(float) * 3)); VK_CHECK_RESULT(vulkanDevice->createBuffer(bufferUsageFlags, memoryUsageFlags, &raygenShaderBindingTable, bufferSize));
VK_CHECK_RESULT(vulkanDevice->createBuffer(bufferUsageFlags, memoryUsageFlags, &hitShaderBindingTable, handleSize + sizeof(float) * 3)); VK_CHECK_RESULT(vulkanDevice->createBuffer(bufferUsageFlags, memoryUsageFlags, &missShaderBindingTable, bufferSize));
VK_CHECK_RESULT(vulkanDevice->createBuffer(bufferUsageFlags, memoryUsageFlags, &hitShaderBindingTable, bufferSize));
// Copy handles // Copy handles
raygenShaderBindingTable.map(); raygenShaderBindingTable.map();
@ -768,18 +769,18 @@ public:
// that we use to store our color data // that we use to store our color data
VkStridedDeviceAddressRegionKHR raygenShaderSbtEntry{}; VkStridedDeviceAddressRegionKHR raygenShaderSbtEntry{};
raygenShaderSbtEntry.deviceAddress = getBufferDeviceAddress(raygenShaderBindingTable.buffer); raygenShaderSbtEntry.deviceAddress = getBufferDeviceAddress(raygenShaderBindingTable.buffer);
raygenShaderSbtEntry.stride = handleSizeAligned;
raygenShaderSbtEntry.size = vks::tools::alignedSize(handleSizeAligned + 3 * sizeof(float), rayTracingPipelineProperties.shaderGroupBaseAlignment); raygenShaderSbtEntry.size = vks::tools::alignedSize(handleSizeAligned + 3 * sizeof(float), rayTracingPipelineProperties.shaderGroupBaseAlignment);
raygenShaderSbtEntry.stride = raygenShaderSbtEntry.size;
VkStridedDeviceAddressRegionKHR missShaderSbtEntry{}; VkStridedDeviceAddressRegionKHR missShaderSbtEntry{};
missShaderSbtEntry.deviceAddress = getBufferDeviceAddress(missShaderBindingTable.buffer); missShaderSbtEntry.deviceAddress = getBufferDeviceAddress(missShaderBindingTable.buffer);
missShaderSbtEntry.stride = handleSizeAligned;
missShaderSbtEntry.size = vks::tools::alignedSize(handleSizeAligned + 3 * sizeof(float), rayTracingPipelineProperties.shaderGroupBaseAlignment); missShaderSbtEntry.size = vks::tools::alignedSize(handleSizeAligned + 3 * sizeof(float), rayTracingPipelineProperties.shaderGroupBaseAlignment);
missShaderSbtEntry.stride = missShaderSbtEntry.size;
VkStridedDeviceAddressRegionKHR hitShaderSbtEntry{}; VkStridedDeviceAddressRegionKHR hitShaderSbtEntry{};
hitShaderSbtEntry.deviceAddress = getBufferDeviceAddress(hitShaderBindingTable.buffer); hitShaderSbtEntry.deviceAddress = getBufferDeviceAddress(hitShaderBindingTable.buffer);
hitShaderSbtEntry.stride = handleSizeAligned;
hitShaderSbtEntry.size = vks::tools::alignedSize(handleSizeAligned + 3 * sizeof(float), rayTracingPipelineProperties.shaderGroupBaseAlignment); hitShaderSbtEntry.size = vks::tools::alignedSize(handleSizeAligned + 3 * sizeof(float), rayTracingPipelineProperties.shaderGroupBaseAlignment);
hitShaderSbtEntry.stride = hitShaderSbtEntry.size;
VkStridedDeviceAddressRegionKHR callableShaderSbtEntry{}; VkStridedDeviceAddressRegionKHR callableShaderSbtEntry{};

BIN
shaders/glsl/raytracingsbtdata/closesthit.rchit.spv
View file

Binary file not shown.

BIN
shaders/glsl/raytracingsbtdata/miss.rmiss.spv
View file

Binary file not shown.

BIN
shaders/glsl/raytracingsbtdata/raygen.rgen.spv
View file

Binary file not shown.