Skip to content

SPIRVResources: fix storage buffer name detection for shaders compiled by slang #718

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 12, 2025
+9 −7
Merged

SPIRVResources: fix storage buffer name detection for shaders compiled by slang #718

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8a86e2a
Fix https://github.com/DiligentGraphics/DiligentCore/issues/717
hzqst Oct 11, 2025
bcd8c43
Fix formatting
hzqst Oct 11, 2025
2231e07
Fix formatting.
hzqst Oct 11, 2025
bf0eb58
Rename GetUBName to GetUBOrSBName.
hzqst Oct 12, 2025
e9d3623
fix formatting.
hzqst Oct 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions Graphics/ShaderTools/src/SPIRVShaderResources.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,19 @@ const std::string& GetUBName(diligent_spirv_cross::Compiler& Compi
return ((IRSource.hlsl || IRSource.lang == spv::SourceLanguageSlang) && !instance_name.empty()) ? instance_name : UB.name;
}

const std::string& GetSSBName(diligent_spirv_cross::Compiler& Compiler,
const diligent_spirv_cross::Resource& SSB,
const diligent_spirv_cross::ParsedIR::Source& IRSource)
{
//layout(std430, binding = 3) readonly buffer StructuredBuffer_world_material_t_std430_t_0 // <-- type name
//{
// world_material_t_std430_0 _data[];
//} WorldMaterialSSBO; // <-- instance name

const std::string& instance_name = Compiler.get_name(SSB.id);
return ((IRSource.hlsl || IRSource.lang == spv::SourceLanguageSlang) && !instance_name.empty()) ? instance_name : SSB.name;
}

static SHADER_CODE_BASIC_TYPE SpirvBaseTypeToShaderCodeBasicType(diligent_spirv_cross::SPIRType::BaseType SpvBaseType)
{
switch (SpvBaseType)
Expand Down Expand Up @@ -421,10 +434,11 @@ SPIRVShaderResources::SPIRVShaderResources(IMemoryAllocator& Allocator,
size_t ResourceNamesPoolSize = 0;
for (const diligent_spirv_cross::Resource& ub : resources.uniform_buffers)
ResourceNamesPoolSize += GetUBName(Compiler, ub, ParsedIRSource).length() + 1;
for (const diligent_spirv_cross::Resource& sb : resources.storage_buffers)
ResourceNamesPoolSize += GetSSBName(Compiler, sb, ParsedIRSource).length() + 1;
static_assert(Uint32{SPIRVShaderResourceAttribs::ResourceType::NumResourceTypes} == 12, "Please account for the new resource type below");
for (auto* pResType :
{
&resources.storage_buffers,
&resources.storage_images,
&resources.sampled_images,
&resources.atomic_counters,
Expand Down Expand Up @@ -538,6 +552,7 @@ SPIRVShaderResources::SPIRVShaderResources(IMemoryAllocator& Allocator,
Uint32 CurrSB = 0;
for (const diligent_spirv_cross::Resource& SB : resources.storage_buffers)
{
const std::string& name = GetSSBName(Compiler, SB, ParsedIRSource);
diligent_spirv_cross::Bitset BufferFlags = Compiler.get_buffer_block_flags(SB.id);
bool IsReadOnly = BufferFlags.get(spv::DecorationNonWritable);

Expand All @@ -553,7 +568,7 @@ SPIRVShaderResources::SPIRVShaderResources(IMemoryAllocator& Allocator,
{
Compiler,
SB,
ResourceNamesPool.CopyString(SB.name),
ResourceNamesPool.CopyString(name),
ResType,
static_cast<Uint32>(Size),
static_cast<Uint32>(Stride) //
Expand Down
Loading