lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-13 05:20:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Vulkan Shader Feedback clamp BDA offset to maximum byte offset

Browse Source 
This will include any byte offset the feedback slot has

For non-BDA clamp the ssboindex to the maximum array index
This commit is contained in:
Jake Turner
2025-07-09 14:06:36 +01:00
parent 3e70a37fac
commit eede382884
1 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_shader_feedback.cpp
+25 -11
View File
@@ -374,6 +374,9 @@ void AnnotateShader(const ShaderReflection &refl, const SPIRVPatchData &patchDat
// store the maximum slot we can use, for clamping outputs to avoid writing out of bounds
rdcspv::Id maxSlotID = targetIndexWidth == 64 ? editor.AddConstantImmediate<uint64_t>(maxSlot)
: editor.AddConstantImmediate<uint32_t>(maxSlot);
rdcspv::Id maxSlotByteOffsetID =
targetIndexWidth == 64 ? editor.AddConstantImmediate<uint64_t>(maxSlot * sizeof(uint32_t))
: editor.AddConstantImmediate<uint32_t>(maxSlot * sizeof(uint32_t));
rdcspv::Id maxPrintfWordOffset =
editor.AddConstantImmediate<uint32_t>(Vulkan_Debug_PrintfBufferSize() / sizeof(uint32_t));
@@ -1409,17 +1412,6 @@ void AnnotateShader(const ShaderReflection &refl, const SPIRVPatchData &patchDat
}
}
// clamp the index to the maximum slot. If the user is reading out of bounds, don't write
// out of bounds.
{
rdcspv::Id clampedtype =
editor.DeclareType(rdcspv::Scalar(rdcspv::Op::TypeInt, targetIndexWidth, false));
index = editor.AddOperation(
it, rdcspv::OpGLSL450(clampedtype, editor.MakeId(), glsl450,
rdcspv::GLSLstd450::UMin, {index, maxSlotID}));
it++;
}
rdcspv::Id bufptr;
if(IsBDA(storageMode))
@@ -1438,6 +1430,17 @@ void AnnotateShader(const ShaderReflection &refl, const SPIRVPatchData &patchDat
it, rdcspv::OpIAdd(indexOffsetType, editor.MakeId(), varIt->second, shiftedindex));
it++;
// clamp the offset address to the maximum byte offset. If the user is reading out of
// bounds, don't write out of bounds.
{
rdcspv::Id clampedtype =
editor.DeclareType(rdcspv::Scalar(rdcspv::Op::TypeInt, targetIndexWidth, false));
offsetaddr = editor.AddOperation(
it, rdcspv::OpGLSL450(clampedtype, editor.MakeId(), glsl450,
rdcspv::GLSLstd450::UMin, {offsetaddr, maxSlotByteOffsetID}));
it++;
}
// make a pointer out of it
// uint32_t *bufptr = (uint32_t *)(ptr + offsetaddr)
bufptr = MakeOffsettedPointer<uintvulkanmax_t>(
@@ -1454,6 +1457,17 @@ void AnnotateShader(const ShaderReflection &refl, const SPIRVPatchData &patchDat
it, rdcspv::OpIAdd(uint32Type, editor.MakeId(), index, varIt->second));
it++;
// clamp the ssboindex to the maximum slot. If the user is reading out of bounds, don't
// write out of bounds.
{
rdcspv::Id clampedtype =
editor.DeclareType(rdcspv::Scalar(rdcspv::Op::TypeInt, targetIndexWidth, false));
ssboindex = editor.AddOperation(
it, rdcspv::OpGLSL450(clampedtype, editor.MakeId(), glsl450,
rdcspv::GLSLstd450::UMin, {ssboindex, maxSlotID}));
it++;
}
// accesschain to get the pointer we'll atomic into.
// accesschain is 0 to access rtarray (first member) then ssboindex for array index
// uint32_t *bufptr = (uint32_t *)&buf.rtarray[ssboindex];