Skip to content
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

Add missing StorageClassShaderRecordBufferKHR to spirv-parser #1974

Merged
merged 1 commit into from
Jan 27, 2025
Merged

Add missing StorageClassShaderRecordBufferKHR to spirv-parser #1974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 26 additions & 17 deletions framework/util/spirv_parsing_util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ GFXRECON_BEGIN_NAMESPACE(util)
// used to enable type as key for std::set/map
bool operator<(const SpirVParsingUtil::BufferReferenceInfo& lhs, const SpirVParsingUtil::BufferReferenceInfo& rhs)
{
return std::make_tuple(lhs.set, lhs.binding, lhs.push_constant_block, lhs.buffer_offset, lhs.array_stride) <
std::make_tuple(rhs.set, rhs.binding, rhs.push_constant_block, rhs.buffer_offset, rhs.array_stride);
return std::make_tuple(lhs.source, lhs.set, lhs.binding, lhs.buffer_offset, lhs.array_stride) <
std::make_tuple(rhs.source, rhs.set, rhs.binding, rhs.buffer_offset, rhs.array_stride);
}

// Instruction represents a single Spv::Op instruction.
Expand Down Expand Up @@ -134,10 +134,28 @@ bool SpirVParsingUtil::GetVariableDecorations(const Instruction* variable_insn
const uint32_t variable_id = variable_insn->resultId();
const uint32_t storage_class = variable_insn->operand(0);

if (storage_class == spv::StorageClassPushConstant)
switch (storage_class)
{
buffer_reference_info.push_constant_block = true;
return true;

case spv::StorageClassUniform:
buffer_reference_info.source = BufferReferenceLocation::UNIFORM_BUFFER;
break;

case spv::StorageClassStorageBuffer:
buffer_reference_info.source = BufferReferenceLocation::STORAGE_BUFFER;
break;

case spv::StorageClassShaderRecordBufferKHR:
buffer_reference_info.source = BufferReferenceLocation::SHADER_RECORD_BUFFER;
break;

case spv::StorageClassPushConstant:
buffer_reference_info.source = BufferReferenceLocation::PUSH_CONSTANT_BLOCK;
return true;

default:
GFXRECON_LOG_WARNING_ONCE("Storage class %u not handled\n", storage_class);
return false;
}

for (const Instruction* insn : decorations_instructions_)
Expand All @@ -155,16 +173,7 @@ bool SpirVParsingUtil::GetVariableDecorations(const Instruction* variable_insn
buffer_reference_info.binding = insn->operand(2);
}
}

if (storage_class == spv::StorageClassStorageBuffer || storage_class == spv::StorageClassUniform)
{
return true;
}
else
{
printf("Storage class %u not handled\n", storage_class);
return false;
}
return true;
}

bool SpirVParsingUtil::ParseBufferReferences(const uint32_t* const spirv_code, size_t spirv_num_bytes)
Expand Down Expand Up @@ -287,7 +296,7 @@ bool SpirVParsingUtil::ParseBufferReferences(const uint32_t* const spirv_code, s
// access-chain starts with descriptor-binding root
std::string root_name;

if (buffer_reference_info.push_constant_block)
if (buffer_reference_info.source == BufferReferenceLocation::PUSH_CONSTANT_BLOCK)
{
const SpvReflectBlockVariable* block = spvReflectGetEntryPointPushConstantBlock(
&spv_shader_module.value(), spv_shader_module->entry_point_name, &spv_result);
Expand Down Expand Up @@ -465,7 +474,7 @@ bool SpirVParsingUtil::ParseBufferReferences(const uint32_t* const spirv_code, s
name = name.substr(0, name.size() - 4);

char buf[128];
if (buffer_reference_info.push_constant_block)
if (buffer_reference_info.source == BufferReferenceLocation::PUSH_CONSTANT_BLOCK)
{
snprintf(buf, sizeof(buf), "push-constant-block");
}
Expand Down
19 changes: 14 additions & 5 deletions framework/util/spirv_parsing_util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,22 @@ GFXRECON_BEGIN_NAMESPACE(util)
class SpirVParsingUtil
{
public:
enum class BufferReferenceLocation
{
INVALID = 0,
UNIFORM_BUFFER,
STORAGE_BUFFER,
SHADER_RECORD_BUFFER,
PUSH_CONSTANT_BLOCK
};

struct BufferReferenceInfo
{
uint32_t set = 0;
uint32_t binding = 0;
bool push_constant_block = false;
uint32_t buffer_offset = 0;
uint32_t array_stride = 0;
BufferReferenceLocation source = BufferReferenceLocation::INVALID;
uint32_t set = 0;
uint32_t binding = 0;
uint32_t buffer_offset = 0;
uint32_t array_stride = 0;
};

SpirVParsingUtil() = default;
Expand Down
Loading