diff --git a/common/output_stream.cpp b/common/output_stream.cpp index 4cd8078..0529c90 100644 --- a/common/output_stream.cpp +++ b/common/output_stream.cpp @@ -2183,6 +2183,9 @@ void SpvReflectToYaml::Write(std::ostream& os) { const std::string t1 = Indent(indent_level + 1); const std::string t2 = Indent(indent_level + 2); const std::string t3 = Indent(indent_level + 3); + const std::string t4 = Indent(indent_level + 4); + const std::string t5 = Indent(indent_level + 5); + const std::string t6 = Indent(indent_level + 6); os << "%YAML 1.1" << std::endl; os << "---" << std::endl; @@ -2206,11 +2209,14 @@ void SpvReflectToYaml::Write(std::ostream& os) { for (uint32_t i = 0; i < sm_.push_constant_block_count; ++i) { WriteBlockVariableTypes(os, sm_.push_constant_blocks[i], indent_level + 1); } - for (uint32_t i = 0; i < sm_.input_variable_count; ++i) { - WriteInterfaceVariableTypes(os, *sm_.input_variables[i], indent_level + 1); - } - for (uint32_t i = 0; i < sm_.output_variable_count; ++i) { - WriteInterfaceVariableTypes(os, *sm_.output_variables[i], indent_level + 1); + for (uint32_t i_ep = 0; i_ep < sm_.entry_point_count; ++i_ep) { + const auto& ep = sm_.entry_points[i_ep]; + for (uint32_t i = 0; i < ep.input_variable_count; ++i) { + WriteInterfaceVariableTypes(os, *ep.input_variables[i], indent_level + 1); + } + for (uint32_t i = 0; i < ep.output_variable_count; ++i) { + WriteInterfaceVariableTypes(os, *ep.output_variables[i], indent_level + 1); + } } } @@ -2229,13 +2235,35 @@ void SpvReflectToYaml::Write(std::ostream& os) { WriteDescriptorBinding(os, sm_.descriptor_bindings[i], indent_level + 1); } + os << t0 << "all_descriptor_sets:" << std::endl; + for (uint32_t i_set = 0; i_set < sm_.descriptor_set_count; ++i_set) { + // typedef struct SpvReflectDescriptorSet { + const auto& dset = sm_.descriptor_sets[i_set]; + // uint32_t set; + os << t1 << "- " + << "set: " << dset.set << std::endl; + // uint32_t binding_count; + os << t2 << "binding_count: " << dset.binding_count << std::endl; + // SpvReflectDescriptorBinding** bindings; + os << t2 << "bindings:" << std::endl; + for (uint32_t i_binding = 0; i_binding < dset.binding_count; ++i_binding) { + auto itor = descriptor_binding_to_index_.find(dset.bindings[i_binding]); + assert(itor != descriptor_binding_to_index_.end()); + os << t3 << "- *db" << itor->second << " # " << SafeString(dset.bindings[i_binding]->name) << std::endl; + } + // } SpvReflectDescriptorSet; + } + interface_variable_to_index_.clear(); os << t0 << "all_interface_variables:" << std::endl; - for (uint32_t i = 0; i < sm_.input_variable_count; ++i) { - WriteInterfaceVariable(os, *sm_.input_variables[i], indent_level + 1); - } - for (uint32_t i = 0; i < sm_.output_variable_count; ++i) { - WriteInterfaceVariable(os, *sm_.output_variables[i], indent_level + 1); + for (uint32_t i_ep = 0; i_ep < sm_.entry_point_count; ++i_ep) { + const auto& ep = sm_.entry_points[i_ep]; + for (uint32_t i = 0; i < ep.input_variable_count; ++i) { + WriteInterfaceVariable(os, *ep.input_variables[i], indent_level + 1); + } + for (uint32_t i = 0; i < ep.output_variable_count; ++i) { + WriteInterfaceVariable(os, *ep.output_variables[i], indent_level + 1); + } } // struct SpvReflectShaderModule { @@ -2246,6 +2274,127 @@ void SpvReflectToYaml::Write(std::ostream& os) { os << t1 << "entry_point_name: " << SafeString(sm_.entry_point_name) << std::endl; // uint32_t entry_point_id; os << t1 << "entry_point_id: " << sm_.entry_point_id << std::endl; + // uint32_t entry_point_count; + os << t1 << "entry_point_count: " << sm_.entry_point_count << std::endl; + // SpvReflectEntryPoint* entry_points; + os << t1 << "entry_points:" << std::endl; + for (uint32_t i = 0; i < sm_.entry_point_count; ++i) { + // typedef struct SpvReflectEntryPoint { + const auto& ep = sm_.entry_points[i]; + // const char* name; + os << t2 << "- name: " << SafeString(ep.name) << std::endl; + // uint32_t id; + os << t3 << "id: " << ep.id << std::endl; + + // SpvExecutionModel spirv_execution_model; + os << t3 << "spirv_execution_model: " << ep.spirv_execution_model << " # " + << ToStringSpvExecutionModel(ep.spirv_execution_model) << std::endl; + // SpvReflectShaderStageFlagBits shader_stage; + os << t3 << "shader_stage: " << AsHexString(ep.shader_stage) << " # " << ToStringShaderStage(ep.shader_stage) << std::endl; + + // uint32_t input_variable_count; + os << t3 << "input_variable_count: " << ep.input_variable_count << std::endl; + // SpvReflectInterfaceVariable** input_variables; + os << t3 << "input_variables:" << std::endl; + for (uint32_t i_iv = 0; i_iv < ep.input_variable_count; ++i_iv) { + auto itor = interface_variable_to_index_.find(ep.input_variables[i_iv]); + assert(itor != interface_variable_to_index_.end()); + os << t4 << "- *iv" << itor->second << " # " << SafeString(ep.input_variables[i_iv]->name) << std::endl; + } + // uint32_t output_variable_count; + os << t3 << "output_variable_count: " << ep.output_variable_count << std::endl; + // SpvReflectInterfaceVariable** output_variables; + os << t3 << "output_variables:" << std::endl; + for (uint32_t i_iv = 0; i_iv < ep.output_variable_count; ++i_iv) { + auto itor = interface_variable_to_index_.find(ep.output_variables[i_iv]); + assert(itor != interface_variable_to_index_.end()); + os << t4 << "- *iv" << itor->second << " # " << SafeString(ep.output_variables[i_iv]->name) << std::endl; + } + // uint32_t descriptor_set_count; + os << t3 << "descriptor_set_count: " << ep.descriptor_set_count << std::endl; + // SpvReflectDescriptorSet* descriptor_sets; + os << t3 << "descriptor_sets:" << std::endl; + for (uint32_t i_set = 0; i_set < ep.descriptor_set_count; ++i_set) { + // struct SpvReflectDescriptorSet { + const auto& dset = ep.descriptor_sets[i_set]; + // uint32_t set; + os << t4 << "- set: " << dset.set << std::endl; + // uint32_t binding_count; + os << t5 << "binding_count: " << dset.binding_count << std::endl; + // SpvReflectDescriptorBinding** bindings; + os << t5 << "bindings:" << std::endl; + // for (uint32_t i_binding = 0; i_binding < dset.binding_count; ++i_binding) { + for (uint32_t i_binding = 0; i_binding < dset.binding_count; ++i_binding) { + auto itor = descriptor_binding_to_index_.find(dset.bindings[i_binding]); + assert(itor != descriptor_binding_to_index_.end()); + os << t6 << "- *db" << itor->second << " # " << SafeString(dset.bindings[i_binding]->name) << std::endl; + } + // } SpvReflectDescriptorSet; + } + + // uint32_t used_descriptor_binding_count; + os << t3 << "used_descriptor_binding_count: " << ep.used_descriptor_binding_count << std::endl; + // uint32_t* used_descriptor_bindings; + os << t3 << "used_descriptor_bindings:" << std::endl; + for (uint32_t i_udb = 0; i_udb < ep.used_descriptor_binding_count; ++i_udb) { + const SpvReflectDescriptorBinding* found_db = nullptr; + for (uint32_t i_ds = 0; i_ds < sm_.descriptor_binding_count; ++i_ds) { + if (sm_.descriptor_bindings[i_ds].spirv_id == ep.used_descriptor_bindings[i_udb]) { + found_db = &sm_.descriptor_bindings[i_ds]; + break; + } + } + assert(found_db); + auto itor = descriptor_binding_to_index_.find(found_db); + os << t4 << "- *db" << itor->second << " # " << SafeString(found_db->name) << std::endl; + } + + // uint32_t used_push_constant_block_count; + os << t3 << "used_push_constant_block_count: " << ep.used_push_constant_block_count << std::endl; + // uint32_t* used_push_constant_blocks; + os << t3 << "used_push_constant_blocks:" << std::endl; + for (uint32_t i_pc = 0; i_pc < ep.used_push_constant_block_count; ++i_pc) { + const SpvReflectBlockVariable* found_bv = nullptr; + for (uint32_t i_bv = 0; i_bv < sm_.push_constant_block_count; ++i_bv) { + if (sm_.push_constant_blocks[i_bv].spirv_id == ep.used_push_constant_blocks[i_pc]) { + found_bv = &sm_.push_constant_blocks[i_bv]; + break; + } + } + assert(found_bv); + auto itor = block_variable_to_index_.find(found_bv); + assert(itor != block_variable_to_index_.end()); + os << t4 << "- *bv" << itor->second << " # " << SafeString(found_bv->name) << std::endl; + } + + // uint32_t execution_mode_count; + os << t3 << "execution_mode_count: " << ep.execution_mode_count << std::endl; + // SpvExecutionMode* execution_modes; + os << t3 << "execution_modes: ["; + for (uint32_t i_em = 0; i_em < ep.execution_mode_count; ++i_em) { + if (i_em > 0) { + os << ", "; + } + os << ep.execution_modes[i_em]; + } + os << "]" << std::endl; + + // struct LocalSize { + os << t3 << "local_size: ["; + // uint32_t x; + os << ep.local_size.x << ", "; + // uint32_t y; + os << ep.local_size.y << ", "; + // uint32_t z; + os << ep.local_size.z; + os << "]" << std::endl; + + // uint32_t invocations; // valid for geometry + os << t3 << "invocations: " << ep.invocations << std::endl; + // uint32_t output_vertices; // valid for geometry, tesselation + os << t3 << "output_vertices: " << ep.output_vertices << std::endl; + // } SpvReflectEntryPoint; + } // SpvSourceLanguage source_language; os << t1 << "source_language: " << sm_.source_language << " # " << ToStringSpvSourceLanguage(sm_.source_language) << std::endl; // uint32_t source_language_version; @@ -2255,63 +2404,6 @@ void SpvReflectToYaml::Write(std::ostream& os) { << ToStringSpvExecutionModel(sm_.spirv_execution_model) << std::endl; // SpvShaderStageFlagBits shader_stage; os << t1 << "shader_stage: " << AsHexString(sm_.shader_stage) << " # " << ToStringShaderStage(sm_.shader_stage) << std::endl; - // uint32_t descriptor_binding_count; - os << t1 << "descriptor_binding_count: " << sm_.descriptor_binding_count << std::endl; - // SpvReflectDescriptorBinding* descriptor_bindings; - os << t1 << "descriptor_bindings:" << std::endl; - for (uint32_t i = 0; i < sm_.descriptor_binding_count; ++i) { - auto itor = descriptor_binding_to_index_.find(&sm_.descriptor_bindings[i]); - assert(itor != descriptor_binding_to_index_.end()); - os << t2 << "- *db" << itor->second << " # " << SafeString(sm_.descriptor_bindings[i].name) << std::endl; - } - // uint32_t descriptor_set_count; - os << t1 << "descriptor_set_count: " << sm_.descriptor_set_count << std::endl; - // SpvReflectDescriptorSet descriptor_sets[SPV_REFLECT_MAX_DESCRIPTOR_SETS]; - os << t1 << "descriptor_sets:" << std::endl; - for (uint32_t i_set = 0; i_set < sm_.descriptor_set_count; ++i_set) { - // typedef struct SpvReflectDescriptorSet { - const auto& dset = sm_.descriptor_sets[i_set]; - // uint32_t set; - os << t1 << "- " - << "set: " << dset.set << std::endl; - // uint32_t binding_count; - os << t2 << "binding_count: " << dset.binding_count << std::endl; - // SpvReflectDescriptorBinding** bindings; - os << t2 << "bindings:" << std::endl; - for (uint32_t i_binding = 0; i_binding < dset.binding_count; ++i_binding) { - auto itor = descriptor_binding_to_index_.find(dset.bindings[i_binding]); - assert(itor != descriptor_binding_to_index_.end()); - os << t3 << "- *db" << itor->second << " # " << SafeString(dset.bindings[i_binding]->name) << std::endl; - } - // } SpvReflectDescriptorSet; - } - // uint32_t input_variable_count; - os << t1 << "input_variable_count: " << sm_.input_variable_count << ",\n"; - // SpvReflectInterfaceVariable* input_variables; - os << t1 << "input_variables:" << std::endl; - for (uint32_t i = 0; i < sm_.input_variable_count; ++i) { - auto itor = interface_variable_to_index_.find(sm_.input_variables[i]); - assert(itor != interface_variable_to_index_.end()); - os << t2 << "- *iv" << itor->second << " # " << SafeString(sm_.input_variables[i]->name) << std::endl; - } - // uint32_t output_variable_count; - os << t1 << "output_variable_count: " << sm_.output_variable_count << ",\n"; - // SpvReflectInterfaceVariable* output_variables; - os << t1 << "output_variables:" << std::endl; - for (uint32_t i = 0; i < sm_.output_variable_count; ++i) { - auto itor = interface_variable_to_index_.find(sm_.output_variables[i]); - assert(itor != interface_variable_to_index_.end()); - os << t2 << "- *iv" << itor->second << " # " << SafeString(sm_.output_variables[i]->name) << std::endl; - } - // uint32_t push_constant_count; - os << t1 << "push_constant_count: " << sm_.push_constant_block_count << ",\n"; - // SpvReflectBlockVariable* push_constants; - os << t1 << "push_constants:" << std::endl; - for (uint32_t i = 0; i < sm_.push_constant_block_count; ++i) { - auto itor = block_variable_to_index_.find(&sm_.push_constant_blocks[i]); - assert(itor != block_variable_to_index_.end()); - os << t2 << "- *bv" << itor->second << " # " << SafeString(sm_.push_constant_blocks[i].name) << std::endl; - } // uint32_t spec_constant_count; os << t1 << "specialization_constant_count: " << sm_.spec_constant_count << ",\n"; diff --git a/spirv_reflect.c b/spirv_reflect.c index 8d27a09..2cd8b59 100644 --- a/spirv_reflect.c +++ b/spirv_reflect.c @@ -3594,9 +3594,9 @@ static SpvReflectResult ParseStaticallyUsedResources(SpvReflectPrvParser* p_pars } // Do set intersection to find the used uniform and push constants - size_t used_uniform_count = 0; - result = IntersectSortedAccessedVariable(p_used_accesses, used_acessed_count, uniforms, uniform_count, &p_entry->used_uniforms, - &used_uniform_count); + size_t used_descriptor_set_count = 0; + result = IntersectSortedAccessedVariable(p_used_accesses, used_acessed_count, uniforms, uniform_count, &p_entry->used_descriptor_bindings, + &used_descriptor_set_count); if (result != SPV_REFLECT_RESULT_SUCCESS) { SafeFree(p_used_accesses); return result; @@ -3604,7 +3604,7 @@ static SpvReflectResult ParseStaticallyUsedResources(SpvReflectPrvParser* p_pars size_t used_push_constant_count = 0; result = IntersectSortedAccessedVariable(p_used_accesses, used_acessed_count, push_constants, push_constant_count, - &p_entry->used_push_constants, &used_push_constant_count); + &p_entry->used_push_constant_blocks, &used_push_constant_count); if (result != SPV_REFLECT_RESULT_SUCCESS) { SafeFree(p_used_accesses); return result; @@ -3677,8 +3677,8 @@ static SpvReflectResult ParseStaticallyUsedResources(SpvReflectPrvParser* p_pars SafeFree(p_used_accesses); - p_entry->used_uniform_count = (uint32_t)used_uniform_count; - p_entry->used_push_constant_count = (uint32_t)used_push_constant_count; + p_entry->used_descriptor_binding_count = (uint32_t)used_descriptor_set_count; + p_entry->used_push_constant_block_count = (uint32_t)used_push_constant_count; return SPV_REFLECT_RESULT_SUCCESS; } @@ -4065,7 +4065,7 @@ static SpvReflectResult ParseEntrypointDescriptorSets(SpvReflectShaderModule* p_ for (uint32_t j = 0; j < p_module->descriptor_set_count; ++j) { const SpvReflectDescriptorSet* p_set = &p_module->descriptor_sets[j]; for (uint32_t k = 0; k < p_set->binding_count; ++k) { - bool found = SearchSortedUint32(p_entry->used_uniforms, p_entry->used_uniform_count, p_set->bindings[k]->spirv_id); + bool found = SearchSortedUint32(p_entry->used_descriptor_bindings, p_entry->used_descriptor_binding_count, p_set->bindings[k]->spirv_id); if (found) { ++p_entry->descriptor_set_count; break; @@ -4085,7 +4085,7 @@ static SpvReflectResult ParseEntrypointDescriptorSets(SpvReflectShaderModule* p_ const SpvReflectDescriptorSet* p_set = &p_module->descriptor_sets[j]; uint32_t count = 0; for (uint32_t k = 0; k < p_set->binding_count; ++k) { - bool found = SearchSortedUint32(p_entry->used_uniforms, p_entry->used_uniform_count, p_set->bindings[k]->spirv_id); + bool found = SearchSortedUint32(p_entry->used_descriptor_bindings, p_entry->used_descriptor_binding_count, p_set->bindings[k]->spirv_id); if (found) { ++count; } @@ -4100,7 +4100,7 @@ static SpvReflectResult ParseEntrypointDescriptorSets(SpvReflectShaderModule* p_ return SPV_REFLECT_RESULT_ERROR_ALLOC_FAILED; } for (uint32_t k = 0; k < p_set->binding_count; ++k) { - bool found = SearchSortedUint32(p_entry->used_uniforms, p_entry->used_uniform_count, p_set->bindings[k]->spirv_id); + bool found = SearchSortedUint32(p_entry->used_descriptor_bindings, p_entry->used_descriptor_binding_count, p_set->bindings[k]->spirv_id); if (found) { p_entry_set->bindings[p_entry_set->binding_count++] = p_set->bindings[k]; } @@ -4481,8 +4481,8 @@ void spvReflectDestroyShaderModule(SpvReflectShaderModule* p_module) { SafeFree(p_entry->input_variables); SafeFree(p_entry->output_variables); SafeFree(p_entry->interface_variables); - SafeFree(p_entry->used_uniforms); - SafeFree(p_entry->used_push_constants); + SafeFree(p_entry->used_descriptor_bindings); + SafeFree(p_entry->used_push_constant_blocks); SafeFree(p_entry->execution_modes); } SafeFree(p_module->capabilities); @@ -4583,7 +4583,7 @@ SpvReflectResult spvReflectEnumerateEntryPointDescriptorBindings(const SpvReflec uint32_t count = 0; for (uint32_t i = 0; i < p_module->descriptor_binding_count; ++i) { - bool found = SearchSortedUint32(p_entry->used_uniforms, p_entry->used_uniform_count, p_module->descriptor_bindings[i].spirv_id); + bool found = SearchSortedUint32(p_entry->used_descriptor_bindings, p_entry->used_descriptor_binding_count, p_module->descriptor_bindings[i].spirv_id); if (found) { if (IsNotNull(pp_bindings)) { if (count >= *p_count) { @@ -4870,7 +4870,7 @@ SpvReflectResult spvReflectEnumerateEntryPointPushConstantBlocks(const SpvReflec uint32_t count = 0; for (uint32_t i = 0; i < p_module->push_constant_block_count; ++i) { - bool found = SearchSortedUint32(p_entry->used_push_constants, p_entry->used_push_constant_count, + bool found = SearchSortedUint32(p_entry->used_push_constant_blocks, p_entry->used_push_constant_block_count, p_module->push_constant_blocks[i].spirv_id); if (found) { if (IsNotNull(pp_blocks)) { @@ -4952,7 +4952,7 @@ const SpvReflectDescriptorBinding* spvReflectGetEntryPointDescriptorBinding(cons if (IsNotNull(p_module)) { for (uint32_t index = 0; index < p_module->descriptor_binding_count; ++index) { const SpvReflectDescriptorBinding* p_potential = &p_module->descriptor_bindings[index]; - bool found = SearchSortedUint32(p_entry->used_uniforms, p_entry->used_uniform_count, p_potential->spirv_id); + bool found = SearchSortedUint32(p_entry->used_descriptor_bindings, p_entry->used_descriptor_binding_count, p_potential->spirv_id); if ((p_potential->binding == binding_number) && (p_potential->set == set_number) && found) { p_descriptor = p_potential; break; @@ -5310,7 +5310,7 @@ const SpvReflectBlockVariable* spvReflectGetEntryPointPushConstantBlock(const Sp return NULL; } for (uint32_t i = 0; i < p_module->push_constant_block_count; ++i) { - bool found = SearchSortedUint32(p_entry->used_push_constants, p_entry->used_push_constant_count, + bool found = SearchSortedUint32(p_entry->used_push_constant_blocks, p_entry->used_push_constant_block_count, p_module->push_constant_blocks[i].spirv_id); if (found) { p_push_constant = &p_module->push_constant_blocks[i]; diff --git a/spirv_reflect.h b/spirv_reflect.h index eea30bd..e74ae11 100644 --- a/spirv_reflect.h +++ b/spirv_reflect.h @@ -546,10 +546,10 @@ typedef struct SpvReflectEntryPoint { uint32_t descriptor_set_count; SpvReflectDescriptorSet* descriptor_sets; - uint32_t used_uniform_count; - uint32_t* used_uniforms; - uint32_t used_push_constant_count; - uint32_t* used_push_constants; + uint32_t used_descriptor_binding_count; + uint32_t* used_descriptor_bindings; + uint32_t used_push_constant_block_count; + uint32_t* used_push_constant_blocks; uint32_t execution_mode_count; SpvExecutionMode* execution_modes; @@ -586,8 +586,8 @@ typedef struct SpvReflectSpecializationConstant { */ typedef struct SpvReflectShaderModule { SpvReflectGenerator generator; - const char* entry_point_name; - uint32_t entry_point_id; + const char* entry_point_name; // Uses value(s) from first entry point + uint32_t entry_point_id; // Uses value(s) from first entry point uint32_t entry_point_count; SpvReflectEntryPoint* entry_points; SpvSourceLanguage source_language; @@ -598,20 +598,20 @@ typedef struct SpvReflectShaderModule { SpvReflectCapability* capabilities; SpvExecutionModel spirv_execution_model; // Uses value(s) from first entry point SpvReflectShaderStageFlagBits shader_stage; // Uses value(s) from first entry point - uint32_t descriptor_binding_count; // Uses value(s) from first entry point - SpvReflectDescriptorBinding* descriptor_bindings; // Uses value(s) from first entry point - uint32_t descriptor_set_count; // Uses value(s) from first entry point - SpvReflectDescriptorSet descriptor_sets[SPV_REFLECT_MAX_DESCRIPTOR_SETS]; // Uses value(s) from first entry point + uint32_t descriptor_binding_count; + SpvReflectDescriptorBinding* descriptor_bindings; + uint32_t descriptor_set_count; + SpvReflectDescriptorSet descriptor_sets[SPV_REFLECT_MAX_DESCRIPTOR_SETS]; uint32_t input_variable_count; // Uses value(s) from first entry point SpvReflectInterfaceVariable** input_variables; // Uses value(s) from first entry point uint32_t output_variable_count; // Uses value(s) from first entry point SpvReflectInterfaceVariable** output_variables; // Uses value(s) from first entry point uint32_t interface_variable_count; // Uses value(s) from first entry point SpvReflectInterfaceVariable* interface_variables; // Uses value(s) from first entry point - uint32_t push_constant_block_count; // Uses value(s) from first entry point - SpvReflectBlockVariable* push_constant_blocks; // Uses value(s) from first entry point - uint32_t spec_constant_count; // Uses value(s) from first entry point - SpvReflectSpecializationConstant* spec_constants; // Uses value(s) from first entry point + uint32_t push_constant_block_count; + SpvReflectBlockVariable* push_constant_blocks; + uint32_t spec_constant_count; + SpvReflectSpecializationConstant* spec_constants; struct Internal { SpvReflectModuleFlags module_flags; diff --git a/tests/16bit/vert_in_out_16.spv.yaml b/tests/16bit/vert_in_out_16.spv.yaml index 4649512..a6345ad 100644 --- a/tests/16bit/vert_in_out_16.spv.yaml +++ b/tests/16bit/vert_in_out_16.spv.yaml @@ -105,6 +105,7 @@ all_type_descriptions: members: all_block_variables: all_descriptor_bindings: +all_descriptor_sets: all_interface_variables: - &iv0 spirv_id: 10 @@ -326,32 +327,43 @@ module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 0 # Vertex + shader_stage: 0x00000001 # VS + input_variable_count: 6 + input_variables: + - *iv0 # "a" + - *iv1 # "b" + - *iv2 # "c" + - *iv3 # "d" + - *iv4 # "e" + - *iv5 # "f" + output_variable_count: 6 + output_variables: + - *iv6 # "_a" + - *iv7 # "_b" + - *iv8 # "_c" + - *iv9 # "_d" + - *iv10 # "_e" + - *iv11 # "_f" + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 450 spirv_execution_model: 0 # Vertex shader_stage: 0x00000001 # VS - descriptor_binding_count: 0 - descriptor_bindings: - descriptor_set_count: 0 - descriptor_sets: - input_variable_count: 6, - input_variables: - - *iv0 # "a" - - *iv1 # "b" - - *iv2 # "c" - - *iv3 # "d" - - *iv4 # "e" - - *iv5 # "f" - output_variable_count: 6, - output_variables: - - *iv6 # "_a" - - *iv7 # "_b" - - *iv8 # "_c" - - *iv9 # "_d" - - *iv10 # "_e" - - *iv11 # "_f" - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/access_chains/array_length_from_access_chain.spv.yaml b/tests/access_chains/array_length_from_access_chain.spv.yaml index 360f5d4..a510ca3 100644 --- a/tests/access_chains/array_length_from_access_chain.spv.yaml +++ b/tests/access_chains/array_length_from_access_chain.spv.yaml @@ -123,30 +123,46 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td2 word_offset: { binding: 43, set: 39 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # all_interface_variables: module: generator: 7 # Khronos SPIR-V Tools Assembler entry_point_name: "main" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "main" + id: 1 + spirv_execution_model: 4 # Fragment + shader_stage: 0x00000010 # PS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [7] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 0 # Unknown source_language_version: 0 spirv_execution_model: 4 # Fragment shader_stage: 0x00000010 # PS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/access_chains/pointer_access_chain_phy_storage_buffer.spv.yaml b/tests/access_chains/pointer_access_chain_phy_storage_buffer.spv.yaml index 7f78149..f4ca41d 100644 --- a/tests/access_chains/pointer_access_chain_phy_storage_buffer.spv.yaml +++ b/tests/access_chains/pointer_access_chain_phy_storage_buffer.spv.yaml @@ -175,30 +175,46 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td3 word_offset: { binding: 86, set: 90 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # all_interface_variables: module: generator: 7 # Khronos SPIR-V Tools Assembler entry_point_name: "main" entry_point_id: 2 + entry_point_count: 1 + entry_points: + - name: "main" + id: 2 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [17] + local_size: [1, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 0 # Unknown source_language_version: 0 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/cbuffer_unused/cbuffer_unused_001.spv.yaml b/tests/cbuffer_unused/cbuffer_unused_001.spv.yaml index 317b24c..64632e7 100644 --- a/tests/cbuffer_unused/cbuffer_unused_001.spv.yaml +++ b/tests/cbuffer_unused/cbuffer_unused_001.spv.yaml @@ -3427,6 +3427,12 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td95 word_offset: { binding: 716, set: 712 } +all_descriptor_sets: + - set: 0 + binding_count: 2 + bindings: + - *db0 # "MyParams" + - *db1 # "MyParams2" all_interface_variables: - &iv0 spirv_id: 2 @@ -3468,29 +3474,40 @@ module: generator: 14 # Google spiregg entry_point_name: "main" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "main" + id: 1 + spirv_execution_model: 0 # Vertex + shader_stage: 0x00000001 # VS + input_variable_count: 1 + input_variables: + - *iv0 # "in.var.Position" + output_variable_count: 1 + output_variables: + - *iv1 # + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 2 + bindings: + - *db0 # "MyParams" + - *db1 # "MyParams2" + used_descriptor_binding_count: 2 + used_descriptor_bindings: + - *db0 # "MyParams" + - *db1 # "MyParams2" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 600 spirv_execution_model: 0 # Vertex shader_stage: 0x00000001 # VS - descriptor_binding_count: 2 - descriptor_bindings: - - *db0 # "MyParams" - - *db1 # "MyParams2" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 2 - bindings: - - *db0 # "MyParams" - - *db1 # "MyParams2" - input_variable_count: 1, - input_variables: - - *iv0 # "in.var.Position" - output_variable_count: 1, - output_variables: - - *iv1 # - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/entry_exec_mode/comp_local_size.spv.yaml b/tests/entry_exec_mode/comp_local_size.spv.yaml index 5cd6192..aa75d61 100644 --- a/tests/entry_exec_mode/comp_local_size.spv.yaml +++ b/tests/entry_exec_mode/comp_local_size.spv.yaml @@ -88,30 +88,46 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td1 word_offset: { binding: 65, set: 61 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "" all_interface_variables: module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [17] + local_size: [1, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 450 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "" - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/entry_exec_mode/geom_inv_out_vert.spv.yaml b/tests/entry_exec_mode/geom_inv_out_vert.spv.yaml index acdb216..9baefa0 100644 --- a/tests/entry_exec_mode/geom_inv_out_vert.spv.yaml +++ b/tests/entry_exec_mode/geom_inv_out_vert.spv.yaml @@ -181,6 +181,7 @@ all_type_descriptions: - *td8 all_block_variables: all_descriptor_bindings: +all_descriptor_sets: all_interface_variables: - &iv0 spirv_id: 0 @@ -374,22 +375,33 @@ module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 3 # Geometry + shader_stage: 0x00000008 # GS + input_variable_count: 1 + input_variables: + - *iv4 # "gl_in" + output_variable_count: 1 + output_variables: + - *iv9 # "" + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 4 + execution_modes: [19, 0, 28, 26] + local_size: [0, 0, 0] + invocations: 2 + output_vertices: 2 source_language: 2 # GLSL source_language_version: 450 spirv_execution_model: 3 # Geometry shader_stage: 0x00000008 # GS - descriptor_binding_count: 0 - descriptor_bindings: - descriptor_set_count: 0 - descriptor_sets: - input_variable_count: 1, - input_variables: - - *iv4 # "gl_in" - output_variable_count: 1, - output_variables: - - *iv9 # "" - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/execution_mode/local_size_id.spv.yaml b/tests/execution_mode/local_size_id.spv.yaml index 034a1a0..72b30c9 100644 --- a/tests/execution_mode/local_size_id.spv.yaml +++ b/tests/execution_mode/local_size_id.spv.yaml @@ -3,25 +3,37 @@ all_type_descriptions: all_block_variables: all_descriptor_bindings: +all_descriptor_sets: all_interface_variables: module: generator: 7 # Khronos SPIR-V Tools Assembler entry_point_name: "main" entry_point_id: 2 + entry_point_count: 1 + entry_points: + - name: "main" + id: 2 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [0] + local_size: [16, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 450 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 0 - descriptor_bindings: - descriptor_set_count: 0 - descriptor_sets: - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/execution_mode/local_size_id_spec.spv.yaml b/tests/execution_mode/local_size_id_spec.spv.yaml index 034a1a0..a414386 100644 --- a/tests/execution_mode/local_size_id_spec.spv.yaml +++ b/tests/execution_mode/local_size_id_spec.spv.yaml @@ -3,25 +3,37 @@ all_type_descriptions: all_block_variables: all_descriptor_bindings: +all_descriptor_sets: all_interface_variables: module: generator: 7 # Khronos SPIR-V Tools Assembler entry_point_name: "main" entry_point_id: 2 + entry_point_count: 1 + entry_points: + - name: "main" + id: 2 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [0] + local_size: [4294967295, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 450 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 0 - descriptor_bindings: - descriptor_set_count: 0 - descriptor_sets: - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/glsl/buffer_handle_0.spv.yaml b/tests/glsl/buffer_handle_0.spv.yaml index 2eb538a..f386c34 100644 --- a/tests/glsl/buffer_handle_0.spv.yaml +++ b/tests/glsl/buffer_handle_0.spv.yaml @@ -1285,35 +1285,45 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td55 word_offset: { binding: 209, set: 205 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "s5" + - set: 1 + binding_count: 1 + bindings: + - *db1 # "x" all_interface_variables: module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 4 # Fragment + shader_stage: 0x00000010 # PS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [7] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 450 spirv_execution_model: 4 # Fragment shader_stage: 0x00000010 # PS - descriptor_binding_count: 2 - descriptor_bindings: - - *db0 # "s5" - - *db1 # "x" - descriptor_set_count: 2 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "s5" - - set: 1 - binding_count: 1 - bindings: - - *db1 # "x" - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/glsl/buffer_handle_1.spv.yaml b/tests/glsl/buffer_handle_1.spv.yaml index fa05b2f..3674c0b 100644 --- a/tests/glsl/buffer_handle_1.spv.yaml +++ b/tests/glsl/buffer_handle_1.spv.yaml @@ -672,35 +672,55 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td24 word_offset: { binding: 155, set: 151 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "s5" + - set: 1 + binding_count: 1 + bindings: + - *db1 # "x" all_interface_variables: module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 4 # Fragment + shader_stage: 0x00000010 # PS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 2 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "s5" + - set: 1 + binding_count: 1 + bindings: + - *db1 # "x" + used_descriptor_binding_count: 2 + used_descriptor_bindings: + - *db1 # "x" + - *db0 # "s5" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [7] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 450 spirv_execution_model: 4 # Fragment shader_stage: 0x00000010 # PS - descriptor_binding_count: 2 - descriptor_bindings: - - *db0 # "s5" - - *db1 # "x" - descriptor_set_count: 2 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "s5" - - set: 1 - binding_count: 1 - bindings: - - *db1 # "x" - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/glsl/buffer_handle_2.spv.yaml b/tests/glsl/buffer_handle_2.spv.yaml index 6cb52cd..419e4ea 100644 --- a/tests/glsl/buffer_handle_2.spv.yaml +++ b/tests/glsl/buffer_handle_2.spv.yaml @@ -785,6 +785,12 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td17 word_offset: { binding: 207, set: 203 } +all_descriptor_sets: + - set: 3 + binding_count: 2 + bindings: + - *db0 # "image0_0" + - *db1 # "x" all_interface_variables: - &iv0 spirv_id: 154 @@ -808,29 +814,40 @@ module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 4 # Fragment + shader_stage: 0x00000010 # PS + input_variable_count: 1 + input_variables: + - *iv0 # "gl_FragCoord" + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 3 + binding_count: 2 + bindings: + - *db0 # "image0_0" + - *db1 # "x" + used_descriptor_binding_count: 2 + used_descriptor_bindings: + - *db1 # "x" + - *db0 # "image0_0" + used_push_constant_block_count: 1 + used_push_constant_blocks: + - *bv8 # "pc" + execution_mode_count: 1 + execution_modes: [7] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 450 spirv_execution_model: 4 # Fragment shader_stage: 0x00000010 # PS - descriptor_binding_count: 2 - descriptor_bindings: - - *db0 # "image0_0" - - *db1 # "x" - descriptor_set_count: 1 - descriptor_sets: - - set: 3 - binding_count: 2 - bindings: - - *db0 # "image0_0" - - *db1 # "x" - input_variable_count: 1, - input_variables: - - *iv0 # "gl_FragCoord" - output_variable_count: 0, - output_variables: - push_constant_count: 1, - push_constants: - - *bv8 # "pc" specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/glsl/buffer_handle_3.spv.yaml b/tests/glsl/buffer_handle_3.spv.yaml index 7084090..f538e00 100644 --- a/tests/glsl/buffer_handle_3.spv.yaml +++ b/tests/glsl/buffer_handle_3.spv.yaml @@ -407,35 +407,45 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td13 word_offset: { binding: 130, set: 126 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "s5" + - set: 1 + binding_count: 1 + bindings: + - *db1 # "x" all_interface_variables: module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 4 # Fragment + shader_stage: 0x00000010 # PS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [7] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 450 spirv_execution_model: 4 # Fragment shader_stage: 0x00000010 # PS - descriptor_binding_count: 2 - descriptor_bindings: - - *db0 # "s5" - - *db1 # "x" - descriptor_set_count: 2 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "s5" - - set: 1 - binding_count: 1 - bindings: - - *db1 # "x" - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/glsl/buffer_handle_4.spv.yaml b/tests/glsl/buffer_handle_4.spv.yaml index 4103601..25a7511 100644 --- a/tests/glsl/buffer_handle_4.spv.yaml +++ b/tests/glsl/buffer_handle_4.spv.yaml @@ -282,6 +282,7 @@ all_block_variables: - *bv4 type_description: *td6 all_descriptor_bindings: +all_descriptor_sets: all_interface_variables: - &iv0 spirv_id: 11 @@ -323,23 +324,34 @@ module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 2 + input_variables: + - *iv0 # "gl_GlobalInvocationID" + - *iv1 # "gl_NumWorkGroups" + output_variable_count: 0 + output_variables: + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 1 + used_push_constant_blocks: + - *bv5 # "params" + execution_mode_count: 1 + execution_modes: [17] + local_size: [1, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 460 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 0 - descriptor_bindings: - descriptor_set_count: 0 - descriptor_sets: - input_variable_count: 2, - input_variables: - - *iv0 # "gl_GlobalInvocationID" - - *iv1 # "gl_NumWorkGroups" - output_variable_count: 0, - output_variables: - push_constant_count: 1, - push_constants: - - *bv5 # "params" specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/glsl/buffer_handle_5.spv.yaml b/tests/glsl/buffer_handle_5.spv.yaml index fe5a1f9..9f9d8c7 100644 --- a/tests/glsl/buffer_handle_5.spv.yaml +++ b/tests/glsl/buffer_handle_5.spv.yaml @@ -213,26 +213,38 @@ all_block_variables: - [recursive] type_description: *td4 all_descriptor_bindings: +all_descriptor_sets: all_interface_variables: module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 1 + used_push_constant_blocks: + - *bv3 # "params" + execution_mode_count: 1 + execution_modes: [17] + local_size: [1, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 460 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 0 - descriptor_bindings: - descriptor_set_count: 0 - descriptor_sets: - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 1, - push_constants: - - *bv3 # "params" specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/glsl/buffer_handle_6.spv.yaml b/tests/glsl/buffer_handle_6.spv.yaml index 983ee66..688979d 100644 --- a/tests/glsl/buffer_handle_6.spv.yaml +++ b/tests/glsl/buffer_handle_6.spv.yaml @@ -246,6 +246,7 @@ all_block_variables: - *bv3 type_description: *td4 all_descriptor_bindings: +all_descriptor_sets: all_interface_variables: - &iv0 spirv_id: 9 @@ -269,22 +270,33 @@ module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 4 # Fragment + shader_stage: 0x00000010 # PS + input_variable_count: 0 + input_variables: + output_variable_count: 1 + output_variables: + - *iv0 # "_S149" + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 1 + used_push_constant_blocks: + - *bv4 # "g_GlobalsBDAPushConstant_0" + execution_mode_count: 1 + execution_modes: [7] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 450 spirv_execution_model: 4 # Fragment shader_stage: 0x00000010 # PS - descriptor_binding_count: 0 - descriptor_bindings: - descriptor_set_count: 0 - descriptor_sets: - input_variable_count: 0, - input_variables: - output_variable_count: 1, - output_variables: - - *iv0 # "_S149" - push_constant_count: 1, - push_constants: - - *bv4 # "g_GlobalsBDAPushConstant_0" specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/glsl/buffer_handle_7.spv.yaml b/tests/glsl/buffer_handle_7.spv.yaml index eacf371..c36933c 100644 --- a/tests/glsl/buffer_handle_7.spv.yaml +++ b/tests/glsl/buffer_handle_7.spv.yaml @@ -319,26 +319,38 @@ all_block_variables: - *bv3 type_description: *td5 all_descriptor_bindings: +all_descriptor_sets: all_interface_variables: module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 1 + used_push_constant_blocks: + - *bv4 # "params" + execution_mode_count: 1 + execution_modes: [17] + local_size: [1, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 460 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 0 - descriptor_bindings: - descriptor_set_count: 0 - descriptor_sets: - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 1, - push_constants: - - *bv4 # "params" specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/glsl/buffer_handle_8.spv.yaml b/tests/glsl/buffer_handle_8.spv.yaml index 53d8de2..bf2b183 100644 --- a/tests/glsl/buffer_handle_8.spv.yaml +++ b/tests/glsl/buffer_handle_8.spv.yaml @@ -162,30 +162,41 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td3 word_offset: { binding: 115, set: 111 } +all_descriptor_sets: + - set: 3 + binding_count: 1 + bindings: + - *db0 # "x" all_interface_variables: module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [17] + local_size: [1, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 450 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "x" - descriptor_set_count: 1 - descriptor_sets: - - set: 3 - binding_count: 1 - bindings: - - *db0 # "x" - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/glsl/buffer_handle_9.spv.yaml b/tests/glsl/buffer_handle_9.spv.yaml index 3d3dcd8..2bedfc9 100644 --- a/tests/glsl/buffer_handle_9.spv.yaml +++ b/tests/glsl/buffer_handle_9.spv.yaml @@ -246,6 +246,11 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td2 word_offset: { binding: 191, set: 187 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "" all_interface_variables: - &iv0 spirv_id: 25 @@ -363,27 +368,38 @@ module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 0 # Vertex + shader_stage: 0x00000001 # VS + input_variable_count: 1 + input_variables: + - *iv0 # "gl_VertexIndex" + output_variable_count: 1 + output_variables: + - *iv5 # "" + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 460 spirv_execution_model: 0 # Vertex shader_stage: 0x00000001 # VS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "" - input_variable_count: 1, - input_variables: - - *iv0 # "gl_VertexIndex" - output_variable_count: 1, - output_variables: - - *iv5 # "" - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/glsl/buffer_handle_uvec2_pc.spv.yaml b/tests/glsl/buffer_handle_uvec2_pc.spv.yaml index 5b21db1..09fc311 100644 --- a/tests/glsl/buffer_handle_uvec2_pc.spv.yaml +++ b/tests/glsl/buffer_handle_uvec2_pc.spv.yaml @@ -71,26 +71,38 @@ all_block_variables: - *bv0 type_description: *td1 all_descriptor_bindings: +all_descriptor_sets: all_interface_variables: module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 1 + used_push_constant_blocks: + - *bv1 # "pc" + execution_mode_count: 1 + execution_modes: [17] + local_size: [1, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 460 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 0 - descriptor_bindings: - descriptor_set_count: 0 - descriptor_sets: - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 1, - push_constants: - - *bv1 # "pc" specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/glsl/buffer_handle_uvec2_ssbo.spv.yaml b/tests/glsl/buffer_handle_uvec2_ssbo.spv.yaml index 4d5da4b..dd10041 100644 --- a/tests/glsl/buffer_handle_uvec2_ssbo.spv.yaml +++ b/tests/glsl/buffer_handle_uvec2_ssbo.spv.yaml @@ -88,30 +88,46 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td1 word_offset: { binding: 118, set: 114 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "ssbo" all_interface_variables: module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "ssbo" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "ssbo" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [17] + local_size: [1, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 460 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "ssbo" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "ssbo" - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/glsl/buffer_pointer.spv.yaml b/tests/glsl/buffer_pointer.spv.yaml index da95763..be95d9e 100644 --- a/tests/glsl/buffer_pointer.spv.yaml +++ b/tests/glsl/buffer_pointer.spv.yaml @@ -244,6 +244,7 @@ all_block_variables: - *bv3 type_description: *td4 all_descriptor_bindings: +all_descriptor_sets: all_interface_variables: - &iv0 spirv_id: 26 @@ -267,22 +268,33 @@ module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 5 + entry_point_count: 1 + entry_points: + - name: "main" + id: 5 + spirv_execution_model: 4 # Fragment + shader_stage: 0x00000010 # PS + input_variable_count: 0 + input_variables: + output_variable_count: 1 + output_variables: + - *iv0 # "Color" + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 1 + used_push_constant_blocks: + - *bv4 # "push" + execution_mode_count: 1 + execution_modes: [7] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 460 spirv_execution_model: 4 # Fragment shader_stage: 0x00000010 # PS - descriptor_binding_count: 0 - descriptor_bindings: - descriptor_set_count: 0 - descriptor_sets: - input_variable_count: 0, - input_variables: - output_variable_count: 1, - output_variables: - - *iv0 # "Color" - push_constant_count: 1, - push_constants: - - *bv4 # "push" specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/glsl/built_in_format.spv.yaml b/tests/glsl/built_in_format.spv.yaml index f3525da..5477194 100644 --- a/tests/glsl/built_in_format.spv.yaml +++ b/tests/glsl/built_in_format.spv.yaml @@ -126,6 +126,7 @@ all_type_descriptions: members: all_block_variables: all_descriptor_bindings: +all_descriptor_sets: all_interface_variables: - &iv0 spirv_id: 17 @@ -261,23 +262,34 @@ module: generator: 13 # Google Shaderc over Glslang entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 0 # Vertex + shader_stage: 0x00000001 # VS + input_variable_count: 1 + input_variables: + - *iv0 # "gl_VertexIndex" + output_variable_count: 2 + output_variables: + - *iv5 # "" + - *iv6 # "texcoord" + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 450 spirv_execution_model: 0 # Vertex shader_stage: 0x00000001 # VS - descriptor_binding_count: 0 - descriptor_bindings: - descriptor_set_count: 0 - descriptor_sets: - input_variable_count: 1, - input_variables: - - *iv0 # "gl_VertexIndex" - output_variable_count: 2, - output_variables: - - *iv5 # "" - - *iv6 # "texcoord" - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/glsl/fn_struct_param.spv.yaml b/tests/glsl/fn_struct_param.spv.yaml index b19c475..7d23087 100644 --- a/tests/glsl/fn_struct_param.spv.yaml +++ b/tests/glsl/fn_struct_param.spv.yaml @@ -140,6 +140,11 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td2 word_offset: { binding: 126, set: 122 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "test" all_interface_variables: - &iv0 spirv_id: 19 @@ -163,26 +168,37 @@ module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 4 # Fragment + shader_stage: 0x00000010 # PS + input_variable_count: 0 + input_variables: + output_variable_count: 1 + output_variables: + - *iv0 # "outColor" + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "test" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "test" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [7] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 450 spirv_execution_model: 4 # Fragment shader_stage: 0x00000010 # PS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "test" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "test" - input_variable_count: 0, - input_variables: - output_variable_count: 1, - output_variables: - - *iv0 # "outColor" - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/glsl/frag_array_input.spv.yaml b/tests/glsl/frag_array_input.spv.yaml index b71ebba..c183f63 100644 --- a/tests/glsl/frag_array_input.spv.yaml +++ b/tests/glsl/frag_array_input.spv.yaml @@ -375,6 +375,7 @@ all_type_descriptions: members: all_block_variables: all_descriptor_bindings: +all_descriptor_sets: all_interface_variables: - &iv0 spirv_id: 0 @@ -735,26 +736,37 @@ module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 4 # Fragment + shader_stage: 0x00000010 # PS + input_variable_count: 6 + input_variables: + - *iv4 # "in_a" + - *iv7 # "int_b" + - *iv11 # "in_c" + - *iv14 # "int_d" + - *iv17 # "in_e" + - *iv18 # "in_f" + output_variable_count: 0 + output_variables: + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [7] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 450 spirv_execution_model: 4 # Fragment shader_stage: 0x00000010 # PS - descriptor_binding_count: 0 - descriptor_bindings: - descriptor_set_count: 0 - descriptor_sets: - input_variable_count: 6, - input_variables: - - *iv4 # "in_a" - - *iv7 # "int_b" - - *iv11 # "in_c" - - *iv14 # "int_d" - - *iv17 # "in_e" - - *iv18 # "in_f" - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/glsl/frag_barycentric.spv.yaml b/tests/glsl/frag_barycentric.spv.yaml index 526f693..f3b7976 100644 --- a/tests/glsl/frag_barycentric.spv.yaml +++ b/tests/glsl/frag_barycentric.spv.yaml @@ -54,6 +54,7 @@ all_type_descriptions: members: all_block_variables: all_descriptor_bindings: +all_descriptor_sets: all_interface_variables: - &iv0 spirv_id: 11 @@ -131,24 +132,35 @@ module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 4 # Fragment + shader_stage: 0x00000010 # PS + input_variable_count: 3 + input_variables: + - *iv0 # "gl_BaryCoordNoPerspEXT" + - *iv1 # "vertexIDs" + - *iv2 # "vertexIDs2" + output_variable_count: 1 + output_variables: + - *iv3 # "value" + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [7] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 1 # ESSL source_language_version: 320 spirv_execution_model: 4 # Fragment shader_stage: 0x00000010 # PS - descriptor_binding_count: 0 - descriptor_bindings: - descriptor_set_count: 0 - descriptor_sets: - input_variable_count: 3, - input_variables: - - *iv0 # "gl_BaryCoordNoPerspEXT" - - *iv1 # "vertexIDs" - - *iv2 # "vertexIDs2" - output_variable_count: 1, - output_variables: - - *iv3 # "value" - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/glsl/input_attachment.spv.yaml b/tests/glsl/input_attachment.spv.yaml index 6ef7eae..9a53465 100644 --- a/tests/glsl/input_attachment.spv.yaml +++ b/tests/glsl/input_attachment.spv.yaml @@ -136,6 +136,13 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td0 word_offset: { binding: 130, set: 126 } +all_descriptor_sets: + - set: 0 + binding_count: 3 + bindings: + - *db0 # "MyInputAttachment0" + - *db1 # "MyInputAttachment1" + - *db2 # "MyInputAttachment4" all_interface_variables: - &iv0 spirv_id: 9 @@ -159,30 +166,41 @@ module: generator: 13 # Google Shaderc over Glslang entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 4 # Fragment + shader_stage: 0x00000010 # PS + input_variable_count: 0 + input_variables: + output_variable_count: 1 + output_variables: + - *iv0 # "oColor" + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 3 + bindings: + - *db0 # "MyInputAttachment0" + - *db1 # "MyInputAttachment1" + - *db2 # "MyInputAttachment4" + used_descriptor_binding_count: 3 + used_descriptor_bindings: + - *db0 # "MyInputAttachment0" + - *db1 # "MyInputAttachment1" + - *db2 # "MyInputAttachment4" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [7] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 450 spirv_execution_model: 4 # Fragment shader_stage: 0x00000010 # PS - descriptor_binding_count: 3 - descriptor_bindings: - - *db0 # "MyInputAttachment0" - - *db1 # "MyInputAttachment1" - - *db2 # "MyInputAttachment4" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 3 - bindings: - - *db0 # "MyInputAttachment0" - - *db1 # "MyInputAttachment1" - - *db2 # "MyInputAttachment4" - input_variable_count: 0, - input_variables: - output_variable_count: 1, - output_variables: - - *iv0 # "oColor" - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/glsl/io_vars_vs.spv.yaml b/tests/glsl/io_vars_vs.spv.yaml index 513d4b0..9a36172 100644 --- a/tests/glsl/io_vars_vs.spv.yaml +++ b/tests/glsl/io_vars_vs.spv.yaml @@ -160,6 +160,7 @@ all_type_descriptions: members: all_block_variables: all_descriptor_bindings: +all_descriptor_sets: all_interface_variables: - &iv0 spirv_id: 17 @@ -331,25 +332,36 @@ module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 0 # Vertex + shader_stage: 0x00000001 # VS + input_variable_count: 1 + input_variables: + - *iv0 # "gl_VertexIndex" + output_variable_count: 4 + output_variables: + - *iv5 # "" + - *iv6 # "texcoord" + - *iv7 # "colors" + - *iv8 # "normals" + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 450 spirv_execution_model: 0 # Vertex shader_stage: 0x00000001 # VS - descriptor_binding_count: 0 - descriptor_bindings: - descriptor_set_count: 0 - descriptor_sets: - input_variable_count: 1, - input_variables: - - *iv0 # "gl_VertexIndex" - output_variable_count: 4, - output_variables: - - *iv5 # "" - - *iv6 # "texcoord" - - *iv7 # "colors" - - *iv8 # "normals" - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/glsl/matrix_major_order_glsl.spv.yaml b/tests/glsl/matrix_major_order_glsl.spv.yaml index 37f998e..d61cf34 100644 --- a/tests/glsl/matrix_major_order_glsl.spv.yaml +++ b/tests/glsl/matrix_major_order_glsl.spv.yaml @@ -1015,6 +1015,11 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td27 word_offset: { binding: 657, set: 653 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "" all_interface_variables: - &iv0 spirv_id: 11 @@ -1056,27 +1061,33 @@ module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 4 # Fragment + shader_stage: 0x00000010 # PS + input_variable_count: 1 + input_variables: + - *iv0 # "my_input" + output_variable_count: 1 + output_variables: + - *iv1 # "my_output" + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [7] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 450 spirv_execution_model: 4 # Fragment shader_stage: 0x00000010 # PS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "" - input_variable_count: 1, - input_variables: - - *iv0 # "my_input" - output_variable_count: 1, - output_variables: - - *iv1 # "my_output" - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/glsl/non_writable_image.spv.yaml b/tests/glsl/non_writable_image.spv.yaml index a1db6c3..9fd9443 100644 --- a/tests/glsl/non_writable_image.spv.yaml +++ b/tests/glsl/non_writable_image.spv.yaml @@ -103,6 +103,12 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td0 word_offset: { binding: 68, set: 64 } +all_descriptor_sets: + - set: 0 + binding_count: 2 + bindings: + - *db0 # "input_image" + - *db1 # "output_image" all_interface_variables: - &iv0 spirv_id: 13 @@ -126,28 +132,39 @@ module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 1 + input_variables: + - *iv0 # "gl_GlobalInvocationID" + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 2 + bindings: + - *db0 # "input_image" + - *db1 # "output_image" + used_descriptor_binding_count: 2 + used_descriptor_bindings: + - *db1 # "output_image" + - *db0 # "input_image" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [17] + local_size: [16, 16, 1] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 450 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 2 - descriptor_bindings: - - *db0 # "input_image" - - *db1 # "output_image" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 2 - bindings: - - *db0 # "input_image" - - *db1 # "output_image" - input_variable_count: 1, - input_variables: - - *iv0 # "gl_GlobalInvocationID" - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/glsl/readonly_writeonly.spv.yaml b/tests/glsl/readonly_writeonly.spv.yaml index 8c4f94e..e41213a 100644 --- a/tests/glsl/readonly_writeonly.spv.yaml +++ b/tests/glsl/readonly_writeonly.spv.yaml @@ -175,6 +175,11 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td3 word_offset: { binding: 124, set: 120 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "foo" all_interface_variables: - &iv0 spirv_id: 11 @@ -198,26 +203,37 @@ module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 1 + input_variables: + - *iv0 # "gl_GlobalInvocationID" + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "foo" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "foo" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [17] + local_size: [16, 16, 1] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 450 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "foo" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "foo" - input_variable_count: 1, - input_variables: - - *iv0 # "gl_GlobalInvocationID" - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/glsl/runtime_array_of_array_of_struct.spv.yaml b/tests/glsl/runtime_array_of_array_of_struct.spv.yaml index 39119c1..2b2a154 100644 --- a/tests/glsl/runtime_array_of_array_of_struct.spv.yaml +++ b/tests/glsl/runtime_array_of_array_of_struct.spv.yaml @@ -330,6 +330,12 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td7 word_offset: { binding: 325, set: 321 } +all_descriptor_sets: + - set: 0 + binding_count: 2 + bindings: + - *db0 # "" + - *db1 # "" all_interface_variables: - &iv0 spirv_id: 12 @@ -353,28 +359,39 @@ module: generator: 13 # Google Shaderc over Glslang entry_point_name: "main" entry_point_id: 5 + entry_point_count: 1 + entry_points: + - name: "main" + id: 5 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 1 + input_variables: + - *iv0 # "gl_GlobalInvocationID" + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 2 + bindings: + - *db0 # "" + - *db1 # "" + used_descriptor_binding_count: 2 + used_descriptor_bindings: + - *db1 # "" + - *db0 # "" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [17] + local_size: [32, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 450 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 2 - descriptor_bindings: - - *db0 # "" - - *db1 # "" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 2 - bindings: - - *db0 # "" - - *db1 # "" - input_variable_count: 1, - input_variables: - - *iv0 # "gl_GlobalInvocationID" - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/glsl/storage_buffer.spv.yaml b/tests/glsl/storage_buffer.spv.yaml index 25c98f7..d342673 100644 --- a/tests/glsl/storage_buffer.spv.yaml +++ b/tests/glsl/storage_buffer.spv.yaml @@ -190,6 +190,12 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td3 word_offset: { binding: 274, set: 270 } +all_descriptor_sets: + - set: 0 + binding_count: 2 + bindings: + - *db0 # "" + - *db1 # "" all_interface_variables: - &iv0 spirv_id: 12 @@ -213,28 +219,39 @@ module: generator: 13 # Google Shaderc over Glslang entry_point_name: "main" entry_point_id: 5 + entry_point_count: 1 + entry_points: + - name: "main" + id: 5 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 1 + input_variables: + - *iv0 # "gl_GlobalInvocationID" + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 2 + bindings: + - *db0 # "" + - *db1 # "" + used_descriptor_binding_count: 2 + used_descriptor_bindings: + - *db1 # "" + - *db0 # "" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [17] + local_size: [32, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 450 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 2 - descriptor_bindings: - - *db0 # "" - - *db1 # "" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 2 - bindings: - - *db0 # "" - - *db1 # "" - input_variable_count: 1, - input_variables: - - *iv0 # "gl_GlobalInvocationID" - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/glsl/struct_offset_order.spv.yaml b/tests/glsl/struct_offset_order.spv.yaml index cdad1c5..21d044f 100644 --- a/tests/glsl/struct_offset_order.spv.yaml +++ b/tests/glsl/struct_offset_order.spv.yaml @@ -383,32 +383,42 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td9 word_offset: { binding: 157, set: 153 } +all_descriptor_sets: + - set: 0 + binding_count: 2 + bindings: + - *db0 # "ubo" + - *db1 # "ubo2" all_interface_variables: module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [17] + local_size: [1, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 460 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 2 - descriptor_bindings: - - *db0 # "ubo" - - *db1 # "ubo2" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 2 - bindings: - - *db0 # "ubo" - - *db1 # "ubo2" - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/glsl/texel_buffer.spv.yaml b/tests/glsl/texel_buffer.spv.yaml index 36860dc..681785b 100644 --- a/tests/glsl/texel_buffer.spv.yaml +++ b/tests/glsl/texel_buffer.spv.yaml @@ -209,6 +209,12 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td1 word_offset: { binding: 148, set: 144 } +all_descriptor_sets: + - set: 0 + binding_count: 2 + bindings: + - *db0 # "texel_buffer_i" + - *db1 # "texel_buffer_f" all_interface_variables: - &iv0 spirv_id: 15 @@ -326,29 +332,40 @@ module: generator: 13 # Google Shaderc over Glslang entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 0 # Vertex + shader_stage: 0x00000001 # VS + input_variable_count: 1 + input_variables: + - *iv0 # "gl_InstanceIndex" + output_variable_count: 1 + output_variables: + - *iv5 # "" + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 2 + bindings: + - *db0 # "texel_buffer_i" + - *db1 # "texel_buffer_f" + used_descriptor_binding_count: 2 + used_descriptor_bindings: + - *db0 # "texel_buffer_i" + - *db1 # "texel_buffer_f" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 450 spirv_execution_model: 0 # Vertex shader_stage: 0x00000001 # VS - descriptor_binding_count: 2 - descriptor_bindings: - - *db0 # "texel_buffer_i" - - *db1 # "texel_buffer_f" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 2 - bindings: - - *db0 # "texel_buffer_i" - - *db1 # "texel_buffer_f" - input_variable_count: 1, - input_variables: - - *iv0 # "gl_InstanceIndex" - output_variable_count: 1, - output_variables: - - *iv5 # "" - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/hlsl/append_consume.spv.yaml b/tests/hlsl/append_consume.spv.yaml index 6cddd99..c0108a1 100644 --- a/tests/hlsl/append_consume.spv.yaml +++ b/tests/hlsl/append_consume.spv.yaml @@ -396,6 +396,17 @@ all_descriptor_bindings: uav_counter_binding: *db2 # "counter.var.BufferOut" type_description: *td7 word_offset: { binding: 312, set: 308 } +all_descriptor_sets: + - set: 1 + binding_count: 2 + bindings: + - *db1 # "BufferIn" + - *db0 # "counter.var.BufferIn" + - set: 2 + binding_count: 2 + bindings: + - *db2 # "counter.var.BufferOut" + - *db3 # "BufferOut" all_interface_variables: - &iv0 spirv_id: 26 @@ -437,36 +448,47 @@ module: generator: 14 # Google spiregg entry_point_name: "main" entry_point_id: 19 + entry_point_count: 1 + entry_points: + - name: "main" + id: 19 + spirv_execution_model: 4 # Fragment + shader_stage: 0x00000010 # PS + input_variable_count: 1 + input_variables: + - *iv0 # + output_variable_count: 1 + output_variables: + - *iv1 # "out.var.SV_TARGET" + descriptor_set_count: 2 + descriptor_sets: + - set: 1 + binding_count: 2 + bindings: + - *db1 # "BufferIn" + - *db0 # "counter.var.BufferIn" + - set: 2 + binding_count: 2 + bindings: + - *db2 # "counter.var.BufferOut" + - *db3 # "BufferOut" + used_descriptor_binding_count: 4 + used_descriptor_bindings: + - *db1 # "BufferIn" + - *db0 # "counter.var.BufferIn" + - *db3 # "BufferOut" + - *db2 # "counter.var.BufferOut" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [7] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 600 spirv_execution_model: 4 # Fragment shader_stage: 0x00000010 # PS - descriptor_binding_count: 4 - descriptor_bindings: - - *db1 # "BufferIn" - - *db2 # "counter.var.BufferOut" - - *db0 # "counter.var.BufferIn" - - *db3 # "BufferOut" - descriptor_set_count: 2 - descriptor_sets: - - set: 1 - binding_count: 2 - bindings: - - *db1 # "BufferIn" - - *db0 # "counter.var.BufferIn" - - set: 2 - binding_count: 2 - bindings: - - *db2 # "counter.var.BufferOut" - - *db3 # "BufferOut" - input_variable_count: 1, - input_variables: - - *iv0 # - output_variable_count: 1, - output_variables: - - *iv1 # "out.var.SV_TARGET" - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/hlsl/array_of_structured_buffer.spv.yaml b/tests/hlsl/array_of_structured_buffer.spv.yaml index fbc3421..ad62e78 100644 --- a/tests/hlsl/array_of_structured_buffer.spv.yaml +++ b/tests/hlsl/array_of_structured_buffer.spv.yaml @@ -190,6 +190,12 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td3 word_offset: { binding: 76, set: 72 } +all_descriptor_sets: + - set: 0 + binding_count: 2 + bindings: + - *db0 # "Input" + - *db1 # "Output" all_interface_variables: - &iv0 spirv_id: 2 @@ -213,28 +219,39 @@ module: generator: 14 # Google spiregg entry_point_name: "main" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "main" + id: 1 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 1 + input_variables: + - *iv0 # + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 2 + bindings: + - *db0 # "Input" + - *db1 # "Output" + used_descriptor_binding_count: 2 + used_descriptor_bindings: + - *db0 # "Input" + - *db1 # "Output" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [17] + local_size: [16, 16, 1] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 600 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 2 - descriptor_bindings: - - *db0 # "Input" - - *db1 # "Output" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 2 - bindings: - - *db0 # "Input" - - *db1 # "Output" - input_variable_count: 1, - input_variables: - - *iv0 # - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/hlsl/binding_array.spv.yaml b/tests/hlsl/binding_array.spv.yaml index 14ee29e..13d82d0 100644 --- a/tests/hlsl/binding_array.spv.yaml +++ b/tests/hlsl/binding_array.spv.yaml @@ -120,6 +120,12 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td1 word_offset: { binding: 227, set: 223 } +all_descriptor_sets: + - set: 0 + binding_count: 2 + bindings: + - *db0 # "MySampler" + - *db1 # "MyTexture" all_interface_variables: - &iv0 spirv_id: 23 @@ -161,29 +167,40 @@ module: generator: 14 # Google spiregg entry_point_name: "main" entry_point_id: 17 + entry_point_count: 1 + entry_points: + - name: "main" + id: 17 + spirv_execution_model: 4 # Fragment + shader_stage: 0x00000010 # PS + input_variable_count: 1 + input_variables: + - *iv0 # + output_variable_count: 1 + output_variables: + - *iv1 # "out.var.SV_TARGET" + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 2 + bindings: + - *db0 # "MySampler" + - *db1 # "MyTexture" + used_descriptor_binding_count: 2 + used_descriptor_bindings: + - *db0 # "MySampler" + - *db1 # "MyTexture" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [7] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 600 spirv_execution_model: 4 # Fragment shader_stage: 0x00000010 # PS - descriptor_binding_count: 2 - descriptor_bindings: - - *db0 # "MySampler" - - *db1 # "MyTexture" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 2 - bindings: - - *db0 # "MySampler" - - *db1 # "MyTexture" - input_variable_count: 1, - input_variables: - - *iv0 # - output_variable_count: 1, - output_variables: - - *iv1 # "out.var.SV_TARGET" - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/hlsl/binding_types.spv.yaml b/tests/hlsl/binding_types.spv.yaml index 65c727d..dc9b7c9 100644 --- a/tests/hlsl/binding_types.spv.yaml +++ b/tests/hlsl/binding_types.spv.yaml @@ -1858,6 +1858,39 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td37 word_offset: { binding: 1164, set: 1160 } +all_descriptor_sets: + - set: 0 + binding_count: 29 + bindings: + - *db0 # "MyCBuffer" + - *db1 # "MyConstantBuffer" + - *db2 # "MyTexture1D" + - *db3 # "MyTexture2D" + - *db4 # "MyTexture3D" + - *db5 # "MyTexture1DArray" + - *db6 # "MyTexture2DArray" + - *db7 # "MyRWTexture1D" + - *db8 # "MyRWTexture2D" + - *db9 # "MyRWTexture3D" + - *db10 # "MyRWTexture1DArray" + - *db11 # "MyRWTexture2DArray" + - *db12 # "MyTexture2DMS" + - *db13 # "MyTexture2DMSArray" + - *db14 # "MyTextureCube" + - *db15 # "MyTextureCubeArray" + - *db16 # "MyTBuffer" + - *db17 # "MyTextureBuffer" + - *db18 # "MyBuffer" + - *db19 # "MyRWBuffer" + - *db20 # "MyStructuredBuffer" + - *db22 # "MyRWStructuredBuffer" + - *db21 # "counter.var.MyRWStructuredBuffer" + - *db24 # "MyAppendStructuredBuffer" + - *db23 # "counter.var.MyAppendStructuredBuffer" + - *db26 # "MyConsumeStructuredBuffer" + - *db25 # "counter.var.MyConsumeStructuredBuffer" + - *db27 # "MyByteAddressBuffer" + - *db28 # "MyRWByteAddressBuffer" all_interface_variables: - &iv0 spirv_id: 99 @@ -1899,83 +1932,33 @@ module: generator: 14 # Google spiregg entry_point_name: "main" entry_point_id: 94 + entry_point_count: 1 + entry_points: + - name: "main" + id: 94 + spirv_execution_model: 4 # Fragment + shader_stage: 0x00000010 # PS + input_variable_count: 1 + input_variables: + - *iv0 # + output_variable_count: 1 + output_variables: + - *iv1 # "out.var.SV_TARGET" + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [7] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 600 spirv_execution_model: 4 # Fragment shader_stage: 0x00000010 # PS - descriptor_binding_count: 29 - descriptor_bindings: - - *db0 # "MyCBuffer" - - *db1 # "MyConstantBuffer" - - *db2 # "MyTexture1D" - - *db3 # "MyTexture2D" - - *db4 # "MyTexture3D" - - *db5 # "MyTexture1DArray" - - *db6 # "MyTexture2DArray" - - *db7 # "MyRWTexture1D" - - *db8 # "MyRWTexture2D" - - *db9 # "MyRWTexture3D" - - *db10 # "MyRWTexture1DArray" - - *db11 # "MyRWTexture2DArray" - - *db12 # "MyTexture2DMS" - - *db13 # "MyTexture2DMSArray" - - *db14 # "MyTextureCube" - - *db15 # "MyTextureCubeArray" - - *db16 # "MyTBuffer" - - *db17 # "MyTextureBuffer" - - *db18 # "MyBuffer" - - *db19 # "MyRWBuffer" - - *db20 # "MyStructuredBuffer" - - *db22 # "MyRWStructuredBuffer" - - *db21 # "counter.var.MyRWStructuredBuffer" - - *db24 # "MyAppendStructuredBuffer" - - *db23 # "counter.var.MyAppendStructuredBuffer" - - *db26 # "MyConsumeStructuredBuffer" - - *db25 # "counter.var.MyConsumeStructuredBuffer" - - *db27 # "MyByteAddressBuffer" - - *db28 # "MyRWByteAddressBuffer" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 29 - bindings: - - *db0 # "MyCBuffer" - - *db1 # "MyConstantBuffer" - - *db2 # "MyTexture1D" - - *db3 # "MyTexture2D" - - *db4 # "MyTexture3D" - - *db5 # "MyTexture1DArray" - - *db6 # "MyTexture2DArray" - - *db7 # "MyRWTexture1D" - - *db8 # "MyRWTexture2D" - - *db9 # "MyRWTexture3D" - - *db10 # "MyRWTexture1DArray" - - *db11 # "MyRWTexture2DArray" - - *db12 # "MyTexture2DMS" - - *db13 # "MyTexture2DMSArray" - - *db14 # "MyTextureCube" - - *db15 # "MyTextureCubeArray" - - *db16 # "MyTBuffer" - - *db17 # "MyTextureBuffer" - - *db18 # "MyBuffer" - - *db19 # "MyRWBuffer" - - *db20 # "MyStructuredBuffer" - - *db22 # "MyRWStructuredBuffer" - - *db21 # "counter.var.MyRWStructuredBuffer" - - *db24 # "MyAppendStructuredBuffer" - - *db23 # "counter.var.MyAppendStructuredBuffer" - - *db26 # "MyConsumeStructuredBuffer" - - *db25 # "counter.var.MyConsumeStructuredBuffer" - - *db27 # "MyByteAddressBuffer" - - *db28 # "MyRWByteAddressBuffer" - input_variable_count: 1, - input_variables: - - *iv0 # - output_variable_count: 1, - output_variables: - - *iv1 # "out.var.SV_TARGET" - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/hlsl/cbuffer.spv.yaml b/tests/hlsl/cbuffer.spv.yaml index 9fe9bd7..3ff74e3 100644 --- a/tests/hlsl/cbuffer.spv.yaml +++ b/tests/hlsl/cbuffer.spv.yaml @@ -910,6 +910,11 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td24 word_offset: { binding: 623, set: 619 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "MyCBuffer" all_interface_variables: - &iv0 spirv_id: 37 @@ -951,27 +956,38 @@ module: generator: 14 # Google spiregg entry_point_name: "main" entry_point_id: 32 + entry_point_count: 1 + entry_points: + - name: "main" + id: 32 + spirv_execution_model: 0 # Vertex + shader_stage: 0x00000001 # VS + input_variable_count: 1 + input_variables: + - *iv0 # "in.var.POSITION" + output_variable_count: 1 + output_variables: + - *iv1 # + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "MyCBuffer" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "MyCBuffer" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 600 spirv_execution_model: 0 # Vertex shader_stage: 0x00000001 # VS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "MyCBuffer" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "MyCBuffer" - input_variable_count: 1, - input_variables: - - *iv0 # "in.var.POSITION" - output_variable_count: 1, - output_variables: - - *iv1 # - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/hlsl/constantbuffer.spv.yaml b/tests/hlsl/constantbuffer.spv.yaml index 1b17d97..b10ca1a 100644 --- a/tests/hlsl/constantbuffer.spv.yaml +++ b/tests/hlsl/constantbuffer.spv.yaml @@ -999,6 +999,11 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td24 word_offset: { binding: 425, set: 421 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "MyConstants" all_interface_variables: - &iv0 spirv_id: 3 @@ -1116,27 +1121,38 @@ module: generator: 14 # Google spiregg entry_point_name: "main" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "main" + id: 1 + spirv_execution_model: 0 # Vertex + shader_stage: 0x00000001 # VS + input_variable_count: 1 + input_variables: + - *iv0 # "in.var.POSITION" + output_variable_count: 1 + output_variables: + - *iv5 # "gl_PerVertexOut" + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "MyConstants" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "MyConstants" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 600 spirv_execution_model: 0 # Vertex shader_stage: 0x00000001 # VS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "MyConstants" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "MyConstants" - input_variable_count: 1, - input_variables: - - *iv0 # "in.var.POSITION" - output_variable_count: 1, - output_variables: - - *iv5 # "gl_PerVertexOut" - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/hlsl/constantbuffer_nested_structs.spv.yaml b/tests/hlsl/constantbuffer_nested_structs.spv.yaml index 1b9fcbd..c541a7a 100644 --- a/tests/hlsl/constantbuffer_nested_structs.spv.yaml +++ b/tests/hlsl/constantbuffer_nested_structs.spv.yaml @@ -6809,6 +6809,11 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td190 word_offset: { binding: 692, set: 688 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "MyConstants" all_interface_variables: - &iv0 spirv_id: 3 @@ -6926,27 +6931,38 @@ module: generator: 14 # Google spiregg entry_point_name: "main" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "main" + id: 1 + spirv_execution_model: 0 # Vertex + shader_stage: 0x00000001 # VS + input_variable_count: 1 + input_variables: + - *iv0 # "in.var.POSITION" + output_variable_count: 1 + output_variables: + - *iv5 # "gl_PerVertexOut" + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "MyConstants" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "MyConstants" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 600 spirv_execution_model: 0 # Vertex shader_stage: 0x00000001 # VS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "MyConstants" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "MyConstants" - input_variable_count: 1, - input_variables: - - *iv0 # "in.var.POSITION" - output_variable_count: 1, - output_variables: - - *iv5 # "gl_PerVertexOut" - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/hlsl/counter_buffers.spv.yaml b/tests/hlsl/counter_buffers.spv.yaml index b27ec44..b8af560 100644 --- a/tests/hlsl/counter_buffers.spv.yaml +++ b/tests/hlsl/counter_buffers.spv.yaml @@ -465,6 +465,14 @@ all_descriptor_bindings: uav_counter_binding: *db1 # "counter.var.MyBufferOut" type_description: *td9 word_offset: { binding: 325, set: 321 } +all_descriptor_sets: + - set: 2 + binding_count: 4 + bindings: + - *db0 # "counter.var.MyBufferIn" + - *db1 # "counter.var.MyBufferOut" + - *db2 # "MyBufferIn" + - *db3 # "MyBufferOut" all_interface_variables: - &iv0 spirv_id: 25 @@ -506,33 +514,44 @@ module: generator: 14 # Google spiregg entry_point_name: "main" entry_point_id: 20 + entry_point_count: 1 + entry_points: + - name: "main" + id: 20 + spirv_execution_model: 4 # Fragment + shader_stage: 0x00000010 # PS + input_variable_count: 1 + input_variables: + - *iv0 # + output_variable_count: 1 + output_variables: + - *iv1 # "out.var.SV_TARGET0" + descriptor_set_count: 1 + descriptor_sets: + - set: 2 + binding_count: 4 + bindings: + - *db0 # "counter.var.MyBufferIn" + - *db1 # "counter.var.MyBufferOut" + - *db2 # "MyBufferIn" + - *db3 # "MyBufferOut" + used_descriptor_binding_count: 4 + used_descriptor_bindings: + - *db2 # "MyBufferIn" + - *db0 # "counter.var.MyBufferIn" + - *db3 # "MyBufferOut" + - *db1 # "counter.var.MyBufferOut" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [7] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 600 spirv_execution_model: 4 # Fragment shader_stage: 0x00000010 # PS - descriptor_binding_count: 4 - descriptor_bindings: - - *db0 # "counter.var.MyBufferIn" - - *db1 # "counter.var.MyBufferOut" - - *db2 # "MyBufferIn" - - *db3 # "MyBufferOut" - descriptor_set_count: 1 - descriptor_sets: - - set: 2 - binding_count: 4 - bindings: - - *db0 # "counter.var.MyBufferIn" - - *db1 # "counter.var.MyBufferOut" - - *db2 # "MyBufferIn" - - *db3 # "MyBufferOut" - input_variable_count: 1, - input_variables: - - *iv0 # - output_variable_count: 1, - output_variables: - - *iv1 # "out.var.SV_TARGET0" - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/hlsl/localsize.spv.yaml b/tests/hlsl/localsize.spv.yaml index e012df0..b430343 100644 --- a/tests/hlsl/localsize.spv.yaml +++ b/tests/hlsl/localsize.spv.yaml @@ -3,25 +3,37 @@ all_type_descriptions: all_block_variables: all_descriptor_bindings: +all_descriptor_sets: all_interface_variables: module: generator: 14 # Google spiregg entry_point_name: "csmain" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "csmain" + id: 1 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [17] + local_size: [16, 24, 4] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 600 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 0 - descriptor_bindings: - descriptor_set_count: 0 - descriptor_sets: - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/hlsl/matrix_major_order_hlsl.spv.yaml b/tests/hlsl/matrix_major_order_hlsl.spv.yaml index 7062729..bd22622 100644 --- a/tests/hlsl/matrix_major_order_hlsl.spv.yaml +++ b/tests/hlsl/matrix_major_order_hlsl.spv.yaml @@ -1015,6 +1015,11 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td27 word_offset: { binding: 286, set: 282 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "$Globals" all_interface_variables: - &iv0 spirv_id: 2 @@ -1056,27 +1061,33 @@ module: generator: 14 # Google spiregg entry_point_name: "main" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "main" + id: 1 + spirv_execution_model: 4 # Fragment + shader_stage: 0x00000010 # PS + input_variable_count: 1 + input_variables: + - *iv0 # + output_variable_count: 1 + output_variables: + - *iv1 # "out.var.SV_TARGET" + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [7] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 600 spirv_execution_model: 4 # Fragment shader_stage: 0x00000010 # PS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "$Globals" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "$Globals" - input_variable_count: 1, - input_variables: - - *iv0 # - output_variable_count: 1, - output_variables: - - *iv1 # "out.var.SV_TARGET" - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/hlsl/pushconstant.spv.yaml b/tests/hlsl/pushconstant.spv.yaml index bc74608..5b097a3 100644 --- a/tests/hlsl/pushconstant.spv.yaml +++ b/tests/hlsl/pushconstant.spv.yaml @@ -158,6 +158,7 @@ all_block_variables: - *bv2 type_description: *td3 all_descriptor_bindings: +all_descriptor_sets: all_interface_variables: - &iv0 spirv_id: 2 @@ -181,22 +182,33 @@ module: generator: 14 # Google spiregg entry_point_name: "main" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "main" + id: 1 + spirv_execution_model: 0 # Vertex + shader_stage: 0x00000001 # VS + input_variable_count: 0 + input_variables: + output_variable_count: 1 + output_variables: + - *iv0 # + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 1 + used_push_constant_blocks: + - *bv3 # "g_PushConstants" + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 600 spirv_execution_model: 0 # Vertex shader_stage: 0x00000001 # VS - descriptor_binding_count: 0 - descriptor_bindings: - descriptor_set_count: 0 - descriptor_sets: - input_variable_count: 0, - input_variables: - output_variable_count: 1, - output_variables: - - *iv0 # - push_constant_count: 1, - push_constants: - - *bv3 # "g_PushConstants" specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/hlsl/semantics.spv.yaml b/tests/hlsl/semantics.spv.yaml index 0ae75e0..82defb7 100644 --- a/tests/hlsl/semantics.spv.yaml +++ b/tests/hlsl/semantics.spv.yaml @@ -278,6 +278,11 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td4 word_offset: { binding: 838, set: 834 } +all_descriptor_sets: + - set: 2 + binding_count: 1 + bindings: + - *db0 # "MyConstants" all_interface_variables: - &iv0 spirv_id: 19 @@ -589,42 +594,53 @@ module: generator: 14 # Google spiregg entry_point_name: "main" entry_point_id: 13 + entry_point_count: 1 + entry_points: + - name: "main" + id: 13 + spirv_execution_model: 4 # Fragment + shader_stage: 0x00000010 # PS + input_variable_count: 9 + input_variables: + - *iv0 # + - *iv1 # "in.var.NORMAL" + - *iv2 # "in.var.COLOR_1" + - *iv3 # "in.var.OPACITY_512" + - *iv4 # "in.var.SCALE_987654321" + - *iv5 # "in.var.TEXCOORD0" + - *iv6 # "in.var.TEXCOORD1" + - *iv7 # "in.var.TEXCOORD2" + - *iv8 # + output_variable_count: 8 + output_variables: + - *iv9 # "out.var.SV_TARGET0" + - *iv10 # "out.var.SV_TARGET1" + - *iv11 # "out.var.SV_TARGET2" + - *iv12 # "out.var.SV_TARGET3" + - *iv13 # "out.var.SV_TARGET4" + - *iv14 # "out.var.SV_TARGET5" + - *iv15 # "out.var.SV_TARGET6" + - *iv16 # "out.var.SV_TARGET7" + descriptor_set_count: 1 + descriptor_sets: + - set: 2 + binding_count: 1 + bindings: + - *db0 # "MyConstants" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "MyConstants" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [7] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 600 spirv_execution_model: 4 # Fragment shader_stage: 0x00000010 # PS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "MyConstants" - descriptor_set_count: 1 - descriptor_sets: - - set: 2 - binding_count: 1 - bindings: - - *db0 # "MyConstants" - input_variable_count: 9, - input_variables: - - *iv0 # - - *iv1 # "in.var.NORMAL" - - *iv2 # "in.var.COLOR_1" - - *iv3 # "in.var.OPACITY_512" - - *iv4 # "in.var.SCALE_987654321" - - *iv5 # "in.var.TEXCOORD0" - - *iv6 # "in.var.TEXCOORD1" - - *iv7 # "in.var.TEXCOORD2" - - *iv8 # - output_variable_count: 8, - output_variables: - - *iv9 # "out.var.SV_TARGET0" - - *iv10 # "out.var.SV_TARGET1" - - *iv11 # "out.var.SV_TARGET2" - - *iv12 # "out.var.SV_TARGET3" - - *iv13 # "out.var.SV_TARGET4" - - *iv14 # "out.var.SV_TARGET5" - - *iv15 # "out.var.SV_TARGET6" - - *iv16 # "out.var.SV_TARGET7" - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/hlsl/structuredbuffer.spv.yaml b/tests/hlsl/structuredbuffer.spv.yaml index 69895f2..6ca6083 100644 --- a/tests/hlsl/structuredbuffer.spv.yaml +++ b/tests/hlsl/structuredbuffer.spv.yaml @@ -595,6 +595,11 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td15 word_offset: { binding: 233, set: 229 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "MyData" all_interface_variables: - &iv0 spirv_id: 2 @@ -618,26 +623,37 @@ module: generator: 14 # Google spiregg entry_point_name: "main" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "main" + id: 1 + spirv_execution_model: 4 # Fragment + shader_stage: 0x00000010 # PS + input_variable_count: 0 + input_variables: + output_variable_count: 1 + output_variables: + - *iv0 # "out.var.SV_Target" + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "MyData" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "MyData" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [7] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 600 spirv_execution_model: 4 # Fragment shader_stage: 0x00000010 # PS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "MyData" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "MyData" - input_variable_count: 0, - input_variables: - output_variable_count: 1, - output_variables: - - *iv0 # "out.var.SV_Target" - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/hlsl/user_type.spv.yaml b/tests/hlsl/user_type.spv.yaml index 9017494..b239b43 100644 --- a/tests/hlsl/user_type.spv.yaml +++ b/tests/hlsl/user_type.spv.yaml @@ -2889,68 +2889,7 @@ all_descriptor_bindings: type_description: *td56 word_offset: { binding: 1224, set: 1220 } user_type: TextureBuffer -all_interface_variables: -module: - generator: 14 # Google spiregg - entry_point_name: "main" - entry_point_id: 1 - source_language: 5 # HLSL - source_language_version: 600 - spirv_execution_model: 4 # Fragment - shader_stage: 0x00000010 # PS - descriptor_binding_count: 49 - descriptor_bindings: - - *db0 # "a" - - *db1 # "b" - - *db3 # "c" - - *db2 # "counter.var.c" - - *db5 # "d" - - *db4 # "counter.var.d" - - *db6 # "e" - - *db7 # "f" - - *db8 # "g" - - *db9 # "h" - - *db10 # "i" - - *db11 # "j" - - *db12 # "k" - - *db13 # "l" - - *db14 # "m" - - *db15 # "n" - - *db16 # "o" - - *db17 # "p" - - *db18 # "q" - - *db19 # "r" - - *db20 # "s" - - *db21 # "t" - - *db22 # "u" - - *db23 # "v" - - *db24 # "t1" - - *db25 # "t2" - - *db26 # "eArr" - - *db27 # "fArr" - - *db28 # "gArr" - - *db29 # "hArr" - - *db30 # "iArr" - - *db31 # "jArr" - - *db32 # "kArr" - - *db33 # "lArr" - - *db34 # "mArr" - - *db35 # "nArr" - - *db36 # "oArr" - - *db37 # "pArr" - - *db38 # "qArr" - - *db39 # "rArr" - - *db40 # "sArr" - - *db41 # "tArr" - - *db42 # "MyCBuffer" - - *db43 # "MyTBuffer" - - *db44 # "bab" - - *db45 # "rwbab" - - *db46 # "rs" - - *db47 # "cb" - - *db48 # "tb" - descriptor_set_count: 1 - descriptor_sets: +all_descriptor_sets: - set: 0 binding_count: 49 bindings: @@ -3003,12 +2942,36 @@ module: - *db46 # "rs" - *db47 # "cb" - *db48 # "tb" - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: +all_interface_variables: +module: + generator: 14 # Google spiregg + entry_point_name: "main" + entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "main" + id: 1 + spirv_execution_model: 4 # Fragment + shader_stage: 0x00000010 # PS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [7] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 + source_language: 5 # HLSL + source_language_version: 600 + spirv_execution_model: 4 # Fragment + shader_stage: 0x00000010 # PS specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/interface/geom_input_builtin_array.spv.yaml b/tests/interface/geom_input_builtin_array.spv.yaml index c90c78a..b259b82 100644 --- a/tests/interface/geom_input_builtin_array.spv.yaml +++ b/tests/interface/geom_input_builtin_array.spv.yaml @@ -91,6 +91,7 @@ all_type_descriptions: - *td3 all_block_variables: all_descriptor_bindings: +all_descriptor_sets: all_interface_variables: - &iv0 spirv_id: 0 @@ -189,22 +190,33 @@ module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 3 # Geometry + shader_stage: 0x00000008 # GS + input_variable_count: 1 + input_variables: + - *iv2 # "gl_in" + output_variable_count: 1 + output_variables: + - *iv4 # "" + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 4 + execution_modes: [22, 0, 28, 26] + local_size: [0, 0, 0] + invocations: 4 + output_vertices: 127 source_language: 2 # GLSL source_language_version: 450 spirv_execution_model: 3 # Geometry shader_stage: 0x00000008 # GS - descriptor_binding_count: 0 - descriptor_bindings: - descriptor_set_count: 0 - descriptor_sets: - input_variable_count: 1, - input_variables: - - *iv2 # "gl_in" - output_variable_count: 1, - output_variables: - - *iv4 # "" - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/interface/vertex_input_builtin_block.spv.yaml b/tests/interface/vertex_input_builtin_block.spv.yaml index 20b5bdd..a596dca 100644 --- a/tests/interface/vertex_input_builtin_block.spv.yaml +++ b/tests/interface/vertex_input_builtin_block.spv.yaml @@ -109,6 +109,7 @@ all_type_descriptions: - *td4 all_block_variables: all_descriptor_bindings: +all_descriptor_sets: all_interface_variables: - &iv0 spirv_id: 0 @@ -226,22 +227,33 @@ module: generator: 7 # Khronos SPIR-V Tools Assembler entry_point_name: "main" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "main" + id: 1 + spirv_execution_model: 0 # Vertex + shader_stage: 0x00000001 # VS + input_variable_count: 1 + input_variables: + - *iv2 # + output_variable_count: 1 + output_variables: + - *iv5 # + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 0 # Unknown source_language_version: 0 spirv_execution_model: 0 # Vertex shader_stage: 0x00000001 # VS - descriptor_binding_count: 0 - descriptor_bindings: - descriptor_set_count: 0 - descriptor_sets: - input_variable_count: 1, - input_variables: - - *iv2 # - output_variable_count: 1, - output_variables: - - *iv5 # - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/interface/vertex_input_builtin_non_block.spv.yaml b/tests/interface/vertex_input_builtin_non_block.spv.yaml index 451728f..d3b61f0 100644 --- a/tests/interface/vertex_input_builtin_non_block.spv.yaml +++ b/tests/interface/vertex_input_builtin_non_block.spv.yaml @@ -73,6 +73,7 @@ all_type_descriptions: - *td2 all_block_variables: all_descriptor_bindings: +all_descriptor_sets: all_interface_variables: - &iv0 spirv_id: 19 @@ -170,23 +171,34 @@ module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 0 # Vertex + shader_stage: 0x00000001 # VS + input_variable_count: 2 + input_variables: + - *iv0 # "gl_VertexIndex" + - *iv1 # "gl_InstanceIndex" + output_variable_count: 1 + output_variables: + - *iv4 # "" + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 450 spirv_execution_model: 0 # Vertex shader_stage: 0x00000001 # VS - descriptor_binding_count: 0 - descriptor_bindings: - descriptor_set_count: 0 - descriptor_sets: - input_variable_count: 2, - input_variables: - - *iv0 # "gl_VertexIndex" - - *iv1 # "gl_InstanceIndex" - output_variable_count: 1, - output_variables: - - *iv4 # "" - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/issues/102/function_parameter_access.spv.yaml b/tests/issues/102/function_parameter_access.spv.yaml index 297f647..bec3804 100644 --- a/tests/issues/102/function_parameter_access.spv.yaml +++ b/tests/issues/102/function_parameter_access.spv.yaml @@ -269,6 +269,16 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td2 word_offset: { binding: 56, set: 52 } +all_descriptor_sets: + - set: 0 + binding_count: 6 + bindings: + - *db0 # + - *db1 # + - *db2 # + - *db3 # + - *db4 # + - *db5 # all_interface_variables: - &iv0 spirv_id: 113 @@ -292,36 +302,41 @@ module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 4 # Fragment + shader_stage: 0x00000010 # PS + input_variable_count: 0 + input_variables: + output_variable_count: 1 + output_variables: + - *iv0 # + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 3 + bindings: + - *db0 # + - *db1 # + - *db2 # + used_descriptor_binding_count: 3 + used_descriptor_bindings: + - *db2 # + - *db1 # + - *db0 # + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [7] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 0 # Unknown source_language_version: 0 spirv_execution_model: 4 # Fragment shader_stage: 0x00000010 # PS - descriptor_binding_count: 6 - descriptor_bindings: - - *db0 # - - *db1 # - - *db2 # - - *db3 # - - *db4 # - - *db5 # - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 6 - bindings: - - *db0 # - - *db1 # - - *db2 # - - *db3 # - - *db4 # - - *db5 # - input_variable_count: 0, - input_variables: - output_variable_count: 1, - output_variables: - - *iv0 # - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/issues/178/vertex_input_struct.spv.yaml b/tests/issues/178/vertex_input_struct.spv.yaml index 8cf9384..34089d5 100644 --- a/tests/issues/178/vertex_input_struct.spv.yaml +++ b/tests/issues/178/vertex_input_struct.spv.yaml @@ -56,6 +56,7 @@ all_type_descriptions: - *td1 all_block_variables: all_descriptor_bindings: +all_descriptor_sets: all_interface_variables: - &iv0 spirv_id: 0 @@ -117,21 +118,32 @@ module: generator: 7 # Khronos SPIR-V Tools Assembler entry_point_name: "main" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "main" + id: 1 + spirv_execution_model: 0 # Vertex + shader_stage: 0x00000001 # VS + input_variable_count: 1 + input_variables: + - *iv2 # + output_variable_count: 0 + output_variables: + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 0 # Unknown source_language_version: 0 spirv_execution_model: 0 # Vertex shader_stage: 0x00000001 # VS - descriptor_binding_count: 0 - descriptor_bindings: - descriptor_set_count: 0 - descriptor_sets: - input_variable_count: 1, - input_variables: - - *iv2 # - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/issues/178/vertex_input_struct2.spv.yaml b/tests/issues/178/vertex_input_struct2.spv.yaml index e9a8fc5..b0c1d93 100644 --- a/tests/issues/178/vertex_input_struct2.spv.yaml +++ b/tests/issues/178/vertex_input_struct2.spv.yaml @@ -74,6 +74,7 @@ all_type_descriptions: - *td2 all_block_variables: all_descriptor_bindings: +all_descriptor_sets: all_interface_variables: - &iv0 spirv_id: 0 @@ -154,21 +155,32 @@ module: generator: 7 # Khronos SPIR-V Tools Assembler entry_point_name: "main" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "main" + id: 1 + spirv_execution_model: 0 # Vertex + shader_stage: 0x00000001 # VS + input_variable_count: 1 + input_variables: + - *iv3 # + output_variable_count: 0 + output_variables: + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 0 # Unknown source_language_version: 0 spirv_execution_model: 0 # Vertex shader_stage: 0x00000001 # VS - descriptor_binding_count: 0 - descriptor_bindings: - descriptor_set_count: 0 - descriptor_sets: - input_variable_count: 1, - input_variables: - - *iv3 # - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/issues/227/null_node.spv.yaml b/tests/issues/227/null_node.spv.yaml index 81ad0e4..748777d 100644 --- a/tests/issues/227/null_node.spv.yaml +++ b/tests/issues/227/null_node.spv.yaml @@ -228,30 +228,46 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td5 word_offset: { binding: 114, set: 110 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "" all_interface_variables: module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [17] + local_size: [1, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 450 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "" - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/issues/77/hlsl/array_from_ubo.spv.yaml b/tests/issues/77/hlsl/array_from_ubo.spv.yaml index 409e856..a4ce662 100644 --- a/tests/issues/77/hlsl/array_from_ubo.spv.yaml +++ b/tests/issues/77/hlsl/array_from_ubo.spv.yaml @@ -157,6 +157,11 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td2 word_offset: { binding: 105, set: 101 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "_cbPerObjectBones" all_interface_variables: - &iv0 spirv_id: 2 @@ -234,29 +239,40 @@ module: generator: 14 # Google spiregg entry_point_name: "Test_VS" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "Test_VS" + id: 1 + spirv_execution_model: 0 # Vertex + shader_stage: 0x00000001 # VS + input_variable_count: 2 + input_variables: + - *iv0 # "in.var.POSITION0" + - *iv1 # "in.var.BLENDINDICES" + output_variable_count: 2 + output_variables: + - *iv2 # + - *iv3 # "out.var.POSITION" + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "_cbPerObjectBones" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "_cbPerObjectBones" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 600 spirv_execution_model: 0 # Vertex shader_stage: 0x00000001 # VS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "_cbPerObjectBones" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "_cbPerObjectBones" - input_variable_count: 2, - input_variables: - - *iv0 # "in.var.POSITION0" - - *iv1 # "in.var.BLENDINDICES" - output_variable_count: 2, - output_variables: - - *iv2 # - - *iv3 # "out.var.POSITION" - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/issues/77/hlsl/array_from_ubo_with_O0.spv.yaml b/tests/issues/77/hlsl/array_from_ubo_with_O0.spv.yaml index be36b20..6414706 100644 --- a/tests/issues/77/hlsl/array_from_ubo_with_O0.spv.yaml +++ b/tests/issues/77/hlsl/array_from_ubo_with_O0.spv.yaml @@ -157,6 +157,11 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td2 word_offset: { binding: 213, set: 209 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "_cbPerObjectBones" all_interface_variables: - &iv0 spirv_id: 2 @@ -234,29 +239,40 @@ module: generator: 14 # Google spiregg entry_point_name: "Test_VS" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "Test_VS" + id: 1 + spirv_execution_model: 0 # Vertex + shader_stage: 0x00000001 # VS + input_variable_count: 2 + input_variables: + - *iv0 # "in.var.POSITION0" + - *iv1 # "in.var.BLENDINDICES" + output_variable_count: 2 + output_variables: + - *iv2 # + - *iv3 # "out.var.POSITION" + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "_cbPerObjectBones" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "_cbPerObjectBones" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 600 spirv_execution_model: 0 # Vertex shader_stage: 0x00000001 # VS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "_cbPerObjectBones" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "_cbPerObjectBones" - input_variable_count: 2, - input_variables: - - *iv0 # "in.var.POSITION0" - - *iv1 # "in.var.BLENDINDICES" - output_variable_count: 2, - output_variables: - - *iv2 # - - *iv3 # "out.var.POSITION" - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/issues/77/hlsl/rocketz.spv.yaml b/tests/issues/77/hlsl/rocketz.spv.yaml index 409e856..a4ce662 100644 --- a/tests/issues/77/hlsl/rocketz.spv.yaml +++ b/tests/issues/77/hlsl/rocketz.spv.yaml @@ -157,6 +157,11 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td2 word_offset: { binding: 105, set: 101 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "_cbPerObjectBones" all_interface_variables: - &iv0 spirv_id: 2 @@ -234,29 +239,40 @@ module: generator: 14 # Google spiregg entry_point_name: "Test_VS" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "Test_VS" + id: 1 + spirv_execution_model: 0 # Vertex + shader_stage: 0x00000001 # VS + input_variable_count: 2 + input_variables: + - *iv0 # "in.var.POSITION0" + - *iv1 # "in.var.BLENDINDICES" + output_variable_count: 2 + output_variables: + - *iv2 # + - *iv3 # "out.var.POSITION" + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "_cbPerObjectBones" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "_cbPerObjectBones" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 600 spirv_execution_model: 0 # Vertex shader_stage: 0x00000001 # VS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "_cbPerObjectBones" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "_cbPerObjectBones" - input_variable_count: 2, - input_variables: - - *iv0 # "in.var.POSITION0" - - *iv1 # "in.var.BLENDINDICES" - output_variable_count: 2, - output_variables: - - *iv2 # - - *iv3 # "out.var.POSITION" - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/mesh_shader_ext/mesh_shader_ext.mesh.hlsl.spv.yaml b/tests/mesh_shader_ext/mesh_shader_ext.mesh.hlsl.spv.yaml index 54944a6..49a49d4 100644 --- a/tests/mesh_shader_ext/mesh_shader_ext.mesh.hlsl.spv.yaml +++ b/tests/mesh_shader_ext/mesh_shader_ext.mesh.hlsl.spv.yaml @@ -88,6 +88,7 @@ all_type_descriptions: members: all_block_variables: all_descriptor_bindings: +all_descriptor_sets: all_interface_variables: - &iv0 spirv_id: 2 @@ -219,27 +220,38 @@ module: generator: 14 # Google spiregg entry_point_name: "main" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "main" + id: 1 + spirv_execution_model: 5365 # MeshEXT + shader_stage: 0x00000080 # MESH + input_variable_count: 4 + input_variables: + - *iv0 # + - *iv1 # + - *iv2 # + - *iv3 # + output_variable_count: 3 + output_variables: + - *iv4 # + - *iv5 # + - *iv6 # "out.var.COLOR0" + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 4 + execution_modes: [17, 5298, 26, 5270] + local_size: [32, 1, 1] + invocations: 0 + output_vertices: 64 source_language: 5 # HLSL source_language_version: 670 spirv_execution_model: 5365 # MeshEXT shader_stage: 0x00000080 # MESH - descriptor_binding_count: 0 - descriptor_bindings: - descriptor_set_count: 0 - descriptor_sets: - input_variable_count: 4, - input_variables: - - *iv0 # - - *iv1 # - - *iv2 # - - *iv3 # - output_variable_count: 3, - output_variables: - - *iv4 # - - *iv5 # - - *iv6 # "out.var.COLOR0" - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/mesh_shader_ext/mesh_shader_ext.task.hlsl.spv.yaml b/tests/mesh_shader_ext/mesh_shader_ext.task.hlsl.spv.yaml index 7172410..b6c5e8b 100644 --- a/tests/mesh_shader_ext/mesh_shader_ext.task.hlsl.spv.yaml +++ b/tests/mesh_shader_ext/mesh_shader_ext.task.hlsl.spv.yaml @@ -37,6 +37,7 @@ all_type_descriptions: members: all_block_variables: all_descriptor_bindings: +all_descriptor_sets: all_interface_variables: - &iv0 spirv_id: 2 @@ -114,24 +115,35 @@ module: generator: 14 # Google spiregg entry_point_name: "main" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "main" + id: 1 + spirv_execution_model: 5364 # TaskEXT + shader_stage: 0x00000040 # TASK + input_variable_count: 4 + input_variables: + - *iv0 # + - *iv1 # + - *iv2 # + - *iv3 # + output_variable_count: 0 + output_variables: + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [17] + local_size: [8, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 670 spirv_execution_model: 5364 # TaskEXT shader_stage: 0x00000040 # TASK - descriptor_binding_count: 0 - descriptor_bindings: - descriptor_set_count: 0 - descriptor_sets: - input_variable_count: 4, - input_variables: - - *iv0 # - - *iv1 # - - *iv2 # - - *iv3 # - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/multi_entrypoint/multi_entrypoint.spv.yaml b/tests/multi_entrypoint/multi_entrypoint.spv.yaml index 4dd2fa1..b169612 100644 --- a/tests/multi_entrypoint/multi_entrypoint.spv.yaml +++ b/tests/multi_entrypoint/multi_entrypoint.spv.yaml @@ -192,6 +192,23 @@ all_type_descriptions: member_count: 1 members: - *td9 + - &td11 + id: 21 + op: 23 + type_name: + struct_member_name: + storage_class: -1 # NOT APPLICABLE + type_flags: 0x00000108 # VECTOR FLOAT + decoration_flags: 0x00000000 # NONE + traits: + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 4 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + image: { dim: 0, depth: 0, arrayed: 0, ms: 0, sampled: 0, image_format: 0 } # dim=1D image_format=Unknown + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: all_block_variables: - &bv0 name: @@ -343,6 +360,12 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td2 word_offset: { binding: 163, set: 159 } +all_descriptor_sets: + - set: 0 + binding_count: 2 + bindings: + - *db0 # "tex" + - *db1 # "ubo" all_interface_variables: - &iv0 spirv_id: 4 @@ -435,37 +458,110 @@ all_interface_variables: format: 103 # VK_FORMAT_R32G32_SFLOAT type_description: *td7 word_offset: { location: 167 } + - &iv5 + spirv_id: 4 + name: "iUV" + location: 0 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000000 # NONE + built_in: -1 # ??? (-1) + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 2 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 103 # VK_FORMAT_R32G32_SFLOAT + type_description: *td7 + word_offset: { location: 171 } + - &iv6 + spirv_id: 8 + name: "colour" + location: 0 + storage_class: 3 # Output + semantic: + decoration_flags: 0x00000000 # NONE + built_in: -1 # ??? (-1) + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 4 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 109 # VK_FORMAT_R32G32B32A32_SFLOAT + type_description: *td11 + word_offset: { location: 195 } module: generator: 7 # Khronos SPIR-V Tools Assembler entry_point_name: "entry_vert" entry_point_id: 2 + entry_point_count: 2 + entry_points: + - name: "entry_vert" + id: 2 + spirv_execution_model: 0 # Vertex + shader_stage: 0x00000001 # VS + input_variable_count: 2 + input_variables: + - *iv0 # "iUV" + - *iv1 # "pos" + output_variable_count: 2 + output_variables: + - *iv3 # "" + - *iv4 # "oUV" + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db1 # "ubo" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db1 # "ubo" + used_push_constant_block_count: 1 + used_push_constant_blocks: + - *bv4 # "push_constant_vert" + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 + - name: "entry_frag" + id: 7 + spirv_execution_model: 4 # Fragment + shader_stage: 0x00000010 # PS + input_variable_count: 1 + input_variables: + - *iv5 # "iUV" + output_variable_count: 1 + output_variables: + - *iv6 # "colour" + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 2 + bindings: + - *db0 # "tex" + - *db1 # "ubo" + used_descriptor_binding_count: 2 + used_descriptor_bindings: + - *db1 # "ubo" + - *db0 # "tex" + used_push_constant_block_count: 1 + used_push_constant_blocks: + - *bv6 # "push_constant_frag" + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 450 spirv_execution_model: 0 # Vertex shader_stage: 0x00000001 # VS - descriptor_binding_count: 2 - descriptor_bindings: - - *db0 # "tex" - - *db1 # "ubo" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 2 - bindings: - - *db0 # "tex" - - *db1 # "ubo" - input_variable_count: 2, - input_variables: - - *iv0 # "iUV" - - *iv1 # "pos" - output_variable_count: 2, - output_variables: - - *iv3 # "" - - *iv4 # "oUV" - push_constant_count: 2, - push_constants: - - *bv4 # "push_constant_vert" - - *bv6 # "push_constant_frag" specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/push_constants/non_zero_block_offset.spv.yaml b/tests/push_constants/non_zero_block_offset.spv.yaml index 3b4aa8d..444af87 100644 --- a/tests/push_constants/non_zero_block_offset.spv.yaml +++ b/tests/push_constants/non_zero_block_offset.spv.yaml @@ -230,6 +230,7 @@ all_block_variables: - *bv2 type_description: *td3 all_descriptor_bindings: +all_descriptor_sets: all_interface_variables: - &iv0 spirv_id: 0 @@ -329,22 +330,33 @@ module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 0 # Vertex + shader_stage: 0x00000001 # VS + input_variable_count: 0 + input_variables: + output_variable_count: 1 + output_variables: + - *iv4 # "" + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 1 + used_push_constant_blocks: + - *bv3 # "pc" + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 450 spirv_execution_model: 0 # Vertex shader_stage: 0x00000001 # VS - descriptor_binding_count: 0 - descriptor_bindings: - descriptor_set_count: 0 - descriptor_sets: - input_variable_count: 0, - input_variables: - output_variable_count: 1, - output_variables: - - *iv4 # "" - push_constant_count: 1, - push_constants: - - *bv3 # "pc" specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/push_constants/pointer_in_struct.spv.yaml b/tests/push_constants/pointer_in_struct.spv.yaml index 860e2be..55b25e2 100644 --- a/tests/push_constants/pointer_in_struct.spv.yaml +++ b/tests/push_constants/pointer_in_struct.spv.yaml @@ -226,31 +226,47 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td1 word_offset: { binding: 109, set: 113 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "result" all_interface_variables: module: generator: 0 # ??? entry_point_name: "main" entry_point_id: 2 + entry_point_count: 1 + entry_points: + - name: "main" + id: 2 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "result" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "result" + used_push_constant_block_count: 1 + used_push_constant_blocks: + - *bv5 # "pc" + execution_mode_count: 1 + execution_modes: [17] + local_size: [1, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 11 # Slang source_language_version: 1 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "result" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "result" - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 1, - push_constants: - - *bv5 # "pc" specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/push_constants/pointer_in_struct_2.spv.yaml b/tests/push_constants/pointer_in_struct_2.spv.yaml index 487cf11..2a02479 100644 --- a/tests/push_constants/pointer_in_struct_2.spv.yaml +++ b/tests/push_constants/pointer_in_struct_2.spv.yaml @@ -330,31 +330,47 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td1 word_offset: { binding: 123, set: 127 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "result" all_interface_variables: module: generator: 0 # ??? entry_point_name: "main" entry_point_id: 2 + entry_point_count: 1 + entry_points: + - name: "main" + id: 2 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "result" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "result" + used_push_constant_block_count: 1 + used_push_constant_blocks: + - *bv7 # "pc" + execution_mode_count: 1 + execution_modes: [17] + local_size: [1, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 11 # Slang source_language_version: 1 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "result" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "result" - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 1, - push_constants: - - *bv7 # "pc" specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/push_constants/push_constant_basic_0.spv.yaml b/tests/push_constants/push_constant_basic_0.spv.yaml index f8647d3..f4d9ab4 100644 --- a/tests/push_constants/push_constant_basic_0.spv.yaml +++ b/tests/push_constants/push_constant_basic_0.spv.yaml @@ -383,31 +383,41 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td1 word_offset: { binding: 174, set: 178 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "" all_interface_variables: module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [17] + local_size: [1, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 460 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "" - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 1, - push_constants: - - *bv9 # "" specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/push_constants/push_constant_basic_1.spv.yaml b/tests/push_constants/push_constant_basic_1.spv.yaml index c2fdd17..96e30e2 100644 --- a/tests/push_constants/push_constant_basic_1.spv.yaml +++ b/tests/push_constants/push_constant_basic_1.spv.yaml @@ -383,31 +383,47 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td1 word_offset: { binding: 129, set: 133 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "" all_interface_variables: module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "" + used_push_constant_block_count: 1 + used_push_constant_blocks: + - *bv9 # "" + execution_mode_count: 1 + execution_modes: [17] + local_size: [1, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 460 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "" - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 1, - push_constants: - - *bv9 # "" specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/push_constants/push_constant_basic_2.spv.yaml b/tests/push_constants/push_constant_basic_2.spv.yaml index fc4a816..0db5bd9 100644 --- a/tests/push_constants/push_constant_basic_2.spv.yaml +++ b/tests/push_constants/push_constant_basic_2.spv.yaml @@ -366,31 +366,47 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td1 word_offset: { binding: 129, set: 133 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "result" all_interface_variables: module: generator: 7 # Khronos SPIR-V Tools Assembler entry_point_name: "main" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "main" + id: 1 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "result" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "result" + used_push_constant_block_count: 1 + used_push_constant_blocks: + - *bv9 # "pc" + execution_mode_count: 1 + execution_modes: [17] + local_size: [1, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 11 # Slang source_language_version: 1 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "result" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "result" - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 1, - push_constants: - - *bv9 # "pc" specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/push_constants/push_constant_basic_3.spv.yaml b/tests/push_constants/push_constant_basic_3.spv.yaml index 2a54cb4..b444de6 100644 --- a/tests/push_constants/push_constant_basic_3.spv.yaml +++ b/tests/push_constants/push_constant_basic_3.spv.yaml @@ -609,31 +609,47 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td1 word_offset: { binding: 157, set: 161 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "result" all_interface_variables: module: generator: 0 # ??? entry_point_name: "main" entry_point_id: 2 + entry_point_count: 1 + entry_points: + - name: "main" + id: 2 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "result" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "result" + used_push_constant_block_count: 1 + used_push_constant_blocks: + - *bv14 # "pc" + execution_mode_count: 1 + execution_modes: [17] + local_size: [1, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 11 # Slang source_language_version: 1 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "result" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "result" - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 1, - push_constants: - - *bv14 # "pc" specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/raytrace/rayquery_equal.cs.spv.yaml b/tests/raytrace/rayquery_equal.cs.spv.yaml index b99b7a9..2ea7fcd 100644 --- a/tests/raytrace/rayquery_equal.cs.spv.yaml +++ b/tests/raytrace/rayquery_equal.cs.spv.yaml @@ -120,6 +120,12 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td1 word_offset: { binding: 95, set: 91 } +all_descriptor_sets: + - set: 0 + binding_count: 2 + bindings: + - *db0 # "g_topLevel" + - *db1 # "g_output" all_interface_variables: - &iv0 spirv_id: 4 @@ -143,28 +149,39 @@ module: generator: 14 # Google spiregg entry_point_name: "main" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "main" + id: 1 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 1 + input_variables: + - *iv0 # + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 2 + bindings: + - *db0 # "g_topLevel" + - *db1 # "g_output" + used_descriptor_binding_count: 2 + used_descriptor_bindings: + - *db0 # "g_topLevel" + - *db1 # "g_output" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [17] + local_size: [64, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 650 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 2 - descriptor_bindings: - - *db0 # "g_topLevel" - - *db1 # "g_output" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 2 - bindings: - - *db0 # "g_topLevel" - - *db1 # "g_output" - input_variable_count: 1, - input_variables: - - *iv0 # - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/raytrace/rayquery_init_ds.spv.yaml b/tests/raytrace/rayquery_init_ds.spv.yaml index e2e429f..cb9098d 100644 --- a/tests/raytrace/rayquery_init_ds.spv.yaml +++ b/tests/raytrace/rayquery_init_ds.spv.yaml @@ -138,6 +138,11 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td0 word_offset: { binding: 104, set: 100 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "AccelerationStructure" all_interface_variables: - &iv0 spirv_id: 3 @@ -233,30 +238,41 @@ module: generator: 14 # Google spiregg entry_point_name: "main" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "main" + id: 1 + spirv_execution_model: 2 # TessellationEvaluation + shader_stage: 0x00000004 # DS + input_variable_count: 4 + input_variables: + - *iv0 # + - *iv1 # + - *iv2 # + - *iv3 # + output_variable_count: 1 + output_variables: + - *iv4 # + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "AccelerationStructure" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "AccelerationStructure" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [22] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 650 spirv_execution_model: 2 # TessellationEvaluation shader_stage: 0x00000004 # DS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "AccelerationStructure" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "AccelerationStructure" - input_variable_count: 4, - input_variables: - - *iv0 # - - *iv1 # - - *iv2 # - - *iv3 # - output_variable_count: 1, - output_variables: - - *iv4 # - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/raytrace/rayquery_init_gs.spv.yaml b/tests/raytrace/rayquery_init_gs.spv.yaml index 724d8b8..25f616b 100644 --- a/tests/raytrace/rayquery_init_gs.spv.yaml +++ b/tests/raytrace/rayquery_init_gs.spv.yaml @@ -70,6 +70,11 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td0 word_offset: { binding: 86, set: 82 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "AccelerationStructure" all_interface_variables: - &iv0 spirv_id: 3 @@ -93,26 +98,37 @@ module: generator: 14 # Google spiregg entry_point_name: "main" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "main" + id: 1 + spirv_execution_model: 3 # Geometry + shader_stage: 0x00000008 # GS + input_variable_count: 0 + input_variables: + output_variable_count: 1 + output_variables: + - *iv0 # + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "AccelerationStructure" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "AccelerationStructure" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 4 + execution_modes: [26, 0, 20, 27] + local_size: [0, 0, 0] + invocations: 1 + output_vertices: 3 source_language: 5 # HLSL source_language_version: 650 spirv_execution_model: 3 # Geometry shader_stage: 0x00000008 # GS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "AccelerationStructure" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "AccelerationStructure" - input_variable_count: 0, - input_variables: - output_variable_count: 1, - output_variables: - - *iv0 # - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/raytrace/rayquery_init_hs.spv.yaml b/tests/raytrace/rayquery_init_hs.spv.yaml index d55986f..fb3f399 100644 --- a/tests/raytrace/rayquery_init_hs.spv.yaml +++ b/tests/raytrace/rayquery_init_hs.spv.yaml @@ -121,6 +121,11 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td0 word_offset: { binding: 122, set: 118 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "AccelerationStructure" all_interface_variables: - &iv0 spirv_id: 3 @@ -216,30 +221,41 @@ module: generator: 14 # Google spiregg entry_point_name: "main" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "main" + id: 1 + spirv_execution_model: 1 # TessellationControl + shader_stage: 0x00000002 # HS + input_variable_count: 2 + input_variables: + - *iv0 # "in.var.WORLDPOS" + - *iv1 # + output_variable_count: 3 + output_variables: + - *iv2 # "out.var.BEZIERPOS" + - *iv3 # + - *iv4 # + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "AccelerationStructure" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "AccelerationStructure" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [26] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 3 source_language: 5 # HLSL source_language_version: 650 spirv_execution_model: 1 # TessellationControl shader_stage: 0x00000002 # HS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "AccelerationStructure" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "AccelerationStructure" - input_variable_count: 2, - input_variables: - - *iv0 # "in.var.WORLDPOS" - - *iv1 # - output_variable_count: 3, - output_variables: - - *iv2 # "out.var.BEZIERPOS" - - *iv3 # - - *iv4 # - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/raytrace/rayquery_init_ps.spv.yaml b/tests/raytrace/rayquery_init_ps.spv.yaml index 5333b17..c69f96f 100644 --- a/tests/raytrace/rayquery_init_ps.spv.yaml +++ b/tests/raytrace/rayquery_init_ps.spv.yaml @@ -70,6 +70,11 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td0 word_offset: { binding: 82, set: 78 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "AccelerationStructure" all_interface_variables: - &iv0 spirv_id: 3 @@ -93,26 +98,37 @@ module: generator: 14 # Google spiregg entry_point_name: "main" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "main" + id: 1 + spirv_execution_model: 4 # Fragment + shader_stage: 0x00000010 # PS + input_variable_count: 0 + input_variables: + output_variable_count: 1 + output_variables: + - *iv0 # "out.var.SV_Target" + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "AccelerationStructure" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "AccelerationStructure" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [7] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 650 spirv_execution_model: 4 # Fragment shader_stage: 0x00000010 # PS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "AccelerationStructure" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "AccelerationStructure" - input_variable_count: 0, - input_variables: - output_variable_count: 1, - output_variables: - - *iv0 # "out.var.SV_Target" - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/raytrace/rayquery_init_rahit.spv.yaml b/tests/raytrace/rayquery_init_rahit.spv.yaml index 0af2db0..608b069 100644 --- a/tests/raytrace/rayquery_init_rahit.spv.yaml +++ b/tests/raytrace/rayquery_init_rahit.spv.yaml @@ -53,30 +53,46 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td0 word_offset: { binding: 80, set: 76 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "AccelerationStructure" all_interface_variables: module: generator: 14 # Google spiregg entry_point_name: "main" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "main" + id: 1 + spirv_execution_model: 5315 # AnyHitKHR + shader_stage: 0x00000200 # ANY_HIT + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "AccelerationStructure" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "AccelerationStructure" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 630 spirv_execution_model: 5315 # AnyHitKHR shader_stage: 0x00000200 # ANY_HIT - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "AccelerationStructure" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "AccelerationStructure" - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/raytrace/rayquery_init_rcall.spv.yaml b/tests/raytrace/rayquery_init_rcall.spv.yaml index 47bc5df..95bf4dd 100644 --- a/tests/raytrace/rayquery_init_rcall.spv.yaml +++ b/tests/raytrace/rayquery_init_rcall.spv.yaml @@ -53,30 +53,46 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td0 word_offset: { binding: 80, set: 76 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "AccelerationStructure" all_interface_variables: module: generator: 14 # Google spiregg entry_point_name: "main" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "main" + id: 1 + spirv_execution_model: 5317 # MissKHR + shader_stage: 0x00000800 # MISS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "AccelerationStructure" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "AccelerationStructure" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 630 spirv_execution_model: 5317 # MissKHR shader_stage: 0x00000800 # MISS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "AccelerationStructure" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "AccelerationStructure" - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/raytrace/rayquery_init_rchit.spv.yaml b/tests/raytrace/rayquery_init_rchit.spv.yaml index b4a054e..ae3d63b 100644 --- a/tests/raytrace/rayquery_init_rchit.spv.yaml +++ b/tests/raytrace/rayquery_init_rchit.spv.yaml @@ -53,30 +53,46 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td0 word_offset: { binding: 80, set: 76 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "AccelerationStructure" all_interface_variables: module: generator: 14 # Google spiregg entry_point_name: "main" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "main" + id: 1 + spirv_execution_model: 5316 # ClosestHitKHR + shader_stage: 0x00000400 # CLOSEST_HIT + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "AccelerationStructure" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "AccelerationStructure" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 630 spirv_execution_model: 5316 # ClosestHitKHR shader_stage: 0x00000400 # CLOSEST_HIT - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "AccelerationStructure" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "AccelerationStructure" - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/raytrace/rayquery_init_rgen.spv.yaml b/tests/raytrace/rayquery_init_rgen.spv.yaml index 53df793..e60d06f 100644 --- a/tests/raytrace/rayquery_init_rgen.spv.yaml +++ b/tests/raytrace/rayquery_init_rgen.spv.yaml @@ -53,30 +53,46 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td0 word_offset: { binding: 84, set: 80 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "AccelerationStructure" all_interface_variables: module: generator: 14 # Google spiregg entry_point_name: "main" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "main" + id: 1 + spirv_execution_model: 5313 # RayGenerationKHR + shader_stage: 0x00000100 # RAYGEN + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "AccelerationStructure" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "AccelerationStructure" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 630 spirv_execution_model: 5313 # RayGenerationKHR shader_stage: 0x00000100 # RAYGEN - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "AccelerationStructure" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "AccelerationStructure" - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/raytrace/rayquery_init_rmiss.spv.yaml b/tests/raytrace/rayquery_init_rmiss.spv.yaml index 47bc5df..95bf4dd 100644 --- a/tests/raytrace/rayquery_init_rmiss.spv.yaml +++ b/tests/raytrace/rayquery_init_rmiss.spv.yaml @@ -53,30 +53,46 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td0 word_offset: { binding: 80, set: 76 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "AccelerationStructure" all_interface_variables: module: generator: 14 # Google spiregg entry_point_name: "main" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "main" + id: 1 + spirv_execution_model: 5317 # MissKHR + shader_stage: 0x00000800 # MISS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "AccelerationStructure" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "AccelerationStructure" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 630 spirv_execution_model: 5317 # MissKHR shader_stage: 0x00000800 # MISS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "AccelerationStructure" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "AccelerationStructure" - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/raytrace/raytracing.acceleration-structure.spv.yaml b/tests/raytrace/raytracing.acceleration-structure.spv.yaml index 2af6c30..89056f7 100644 --- a/tests/raytrace/raytracing.acceleration-structure.spv.yaml +++ b/tests/raytrace/raytracing.acceleration-structure.spv.yaml @@ -3,25 +3,37 @@ all_type_descriptions: all_block_variables: all_descriptor_bindings: +all_descriptor_sets: all_interface_variables: module: generator: 14 # Google spiregg entry_point_name: "main" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "main" + id: 1 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [17] + local_size: [1, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 640 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 0 - descriptor_bindings: - descriptor_set_count: 0 - descriptor_sets: - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/raytrace/raytracing.khr.closesthit.spv.yaml b/tests/raytrace/raytracing.khr.closesthit.spv.yaml index 3b547d2..6c1cd12 100644 --- a/tests/raytrace/raytracing.khr.closesthit.spv.yaml +++ b/tests/raytrace/raytracing.khr.closesthit.spv.yaml @@ -138,6 +138,11 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td0 word_offset: { binding: 167, set: 163 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "rs" all_interface_variables: - &iv0 spirv_id: 4 @@ -413,40 +418,51 @@ module: generator: 14 # Google spiregg entry_point_name: "main" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "main" + id: 1 + spirv_execution_model: 5316 # ClosestHitKHR + shader_stage: 0x00000400 # CLOSEST_HIT + input_variable_count: 15 + input_variables: + - *iv0 # + - *iv1 # + - *iv2 # + - *iv3 # + - *iv4 # + - *iv5 # + - *iv6 # + - *iv7 # + - *iv8 # + - *iv9 # + - *iv10 # + - *iv11 # + - *iv12 # + - *iv13 # + - *iv14 # + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "rs" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "rs" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 630 spirv_execution_model: 5316 # ClosestHitKHR shader_stage: 0x00000400 # CLOSEST_HIT - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "rs" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "rs" - input_variable_count: 15, - input_variables: - - *iv0 # - - *iv1 # - - *iv2 # - - *iv3 # - - *iv4 # - - *iv5 # - - *iv6 # - - *iv7 # - - *iv8 # - - *iv9 # - - *iv10 # - - *iv11 # - - *iv12 # - - *iv13 # - - *iv14 # - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/raytrace/raytracing.nv.acceleration-structure.spv.yaml b/tests/raytrace/raytracing.nv.acceleration-structure.spv.yaml index 2af6c30..89056f7 100644 --- a/tests/raytrace/raytracing.nv.acceleration-structure.spv.yaml +++ b/tests/raytrace/raytracing.nv.acceleration-structure.spv.yaml @@ -3,25 +3,37 @@ all_type_descriptions: all_block_variables: all_descriptor_bindings: +all_descriptor_sets: all_interface_variables: module: generator: 14 # Google spiregg entry_point_name: "main" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "main" + id: 1 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [17] + local_size: [1, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 640 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 0 - descriptor_bindings: - descriptor_set_count: 0 - descriptor_sets: - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/raytrace/raytracing.nv.anyhit.spv.yaml b/tests/raytrace/raytracing.nv.anyhit.spv.yaml index 63dad2a..a25af91 100644 --- a/tests/raytrace/raytracing.nv.anyhit.spv.yaml +++ b/tests/raytrace/raytracing.nv.anyhit.spv.yaml @@ -88,6 +88,7 @@ all_type_descriptions: members: all_block_variables: all_descriptor_bindings: +all_descriptor_sets: all_interface_variables: - &iv0 spirv_id: 3 @@ -345,34 +346,45 @@ module: generator: 14 # Google spiregg entry_point_name: "main" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "main" + id: 1 + spirv_execution_model: 5315 # AnyHitKHR + shader_stage: 0x00000200 # ANY_HIT + input_variable_count: 14 + input_variables: + - *iv0 # + - *iv1 # + - *iv2 # + - *iv3 # + - *iv4 # + - *iv5 # + - *iv6 # + - *iv7 # + - *iv8 # + - *iv9 # + - *iv10 # + - *iv11 # + - *iv12 # + - *iv13 # + output_variable_count: 0 + output_variables: + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 630 spirv_execution_model: 5315 # AnyHitKHR shader_stage: 0x00000200 # ANY_HIT - descriptor_binding_count: 0 - descriptor_bindings: - descriptor_set_count: 0 - descriptor_sets: - input_variable_count: 14, - input_variables: - - *iv0 # - - *iv1 # - - *iv2 # - - *iv3 # - - *iv4 # - - *iv5 # - - *iv6 # - - *iv7 # - - *iv8 # - - *iv9 # - - *iv10 # - - *iv11 # - - *iv12 # - - *iv13 # - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/raytrace/raytracing.nv.callable.spv.yaml b/tests/raytrace/raytracing.nv.callable.spv.yaml index cb7b135..ac8dc0e 100644 --- a/tests/raytrace/raytracing.nv.callable.spv.yaml +++ b/tests/raytrace/raytracing.nv.callable.spv.yaml @@ -20,6 +20,7 @@ all_type_descriptions: members: all_block_variables: all_descriptor_bindings: +all_descriptor_sets: all_interface_variables: - &iv0 spirv_id: 3 @@ -61,22 +62,33 @@ module: generator: 14 # Google spiregg entry_point_name: "main" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "main" + id: 1 + spirv_execution_model: 5318 # CallableKHR + shader_stage: 0x00002000 # CALLABLE + input_variable_count: 2 + input_variables: + - *iv0 # + - *iv1 # + output_variable_count: 0 + output_variables: + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 630 spirv_execution_model: 5318 # CallableKHR shader_stage: 0x00002000 # CALLABLE - descriptor_binding_count: 0 - descriptor_bindings: - descriptor_set_count: 0 - descriptor_sets: - input_variable_count: 2, - input_variables: - - *iv0 # - - *iv1 # - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/raytrace/raytracing.nv.closesthit.spv.yaml b/tests/raytrace/raytracing.nv.closesthit.spv.yaml index 92ed25b..67d31a2 100644 --- a/tests/raytrace/raytracing.nv.closesthit.spv.yaml +++ b/tests/raytrace/raytracing.nv.closesthit.spv.yaml @@ -138,6 +138,11 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td0 word_offset: { binding: 142, set: 138 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "rs" all_interface_variables: - &iv0 spirv_id: 4 @@ -395,39 +400,50 @@ module: generator: 14 # Google spiregg entry_point_name: "main" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "main" + id: 1 + spirv_execution_model: 5316 # ClosestHitKHR + shader_stage: 0x00000400 # CLOSEST_HIT + input_variable_count: 14 + input_variables: + - *iv0 # + - *iv1 # + - *iv2 # + - *iv3 # + - *iv4 # + - *iv5 # + - *iv6 # + - *iv7 # + - *iv8 # + - *iv9 # + - *iv10 # + - *iv11 # + - *iv12 # + - *iv13 # + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "rs" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "rs" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 630 spirv_execution_model: 5316 # ClosestHitKHR shader_stage: 0x00000400 # CLOSEST_HIT - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "rs" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "rs" - input_variable_count: 14, - input_variables: - - *iv0 # - - *iv1 # - - *iv2 # - - *iv3 # - - *iv4 # - - *iv5 # - - *iv6 # - - *iv7 # - - *iv8 # - - *iv9 # - - *iv10 # - - *iv11 # - - *iv12 # - - *iv13 # - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/raytrace/raytracing.nv.enum.spv.yaml b/tests/raytrace/raytracing.nv.enum.spv.yaml index 2dbac18..3eb7c87 100644 --- a/tests/raytrace/raytracing.nv.enum.spv.yaml +++ b/tests/raytrace/raytracing.nv.enum.spv.yaml @@ -70,6 +70,11 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td0 word_offset: { binding: 96, set: 92 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "rs" all_interface_variables: - &iv0 spirv_id: 3 @@ -111,27 +116,38 @@ module: generator: 14 # Google spiregg entry_point_name: "main" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "main" + id: 1 + spirv_execution_model: 5313 # RayGenerationKHR + shader_stage: 0x00000100 # RAYGEN + input_variable_count: 2 + input_variables: + - *iv0 # + - *iv1 # + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "rs" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "rs" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 630 spirv_execution_model: 5313 # RayGenerationKHR shader_stage: 0x00000100 # RAYGEN - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "rs" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "rs" - input_variable_count: 2, - input_variables: - - *iv0 # - - *iv1 # - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/raytrace/raytracing.nv.intersection.spv.yaml b/tests/raytrace/raytracing.nv.intersection.spv.yaml index 0b2cab2..ece12a2 100644 --- a/tests/raytrace/raytracing.nv.intersection.spv.yaml +++ b/tests/raytrace/raytracing.nv.intersection.spv.yaml @@ -88,6 +88,7 @@ all_type_descriptions: members: all_block_variables: all_descriptor_bindings: +all_descriptor_sets: all_interface_variables: - &iv0 spirv_id: 2 @@ -327,33 +328,44 @@ module: generator: 14 # Google spiregg entry_point_name: "main" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "main" + id: 1 + spirv_execution_model: 5314 # IntersectionKHR + shader_stage: 0x00001000 # INTERSECTION + input_variable_count: 13 + input_variables: + - *iv0 # + - *iv1 # + - *iv2 # + - *iv3 # + - *iv4 # + - *iv5 # + - *iv6 # + - *iv7 # + - *iv8 # + - *iv9 # + - *iv10 # + - *iv11 # + - *iv12 # + output_variable_count: 0 + output_variables: + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 630 spirv_execution_model: 5314 # IntersectionKHR shader_stage: 0x00001000 # INTERSECTION - descriptor_binding_count: 0 - descriptor_bindings: - descriptor_set_count: 0 - descriptor_sets: - input_variable_count: 13, - input_variables: - - *iv0 # - - *iv1 # - - *iv2 # - - *iv3 # - - *iv4 # - - *iv5 # - - *iv6 # - - *iv7 # - - *iv8 # - - *iv9 # - - *iv10 # - - *iv11 # - - *iv12 # - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/raytrace/raytracing.nv.library.spv.yaml b/tests/raytrace/raytracing.nv.library.spv.yaml index 7b88721..4a7eb74 100644 --- a/tests/raytrace/raytracing.nv.library.spv.yaml +++ b/tests/raytrace/raytracing.nv.library.spv.yaml @@ -138,6 +138,11 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td0 word_offset: { binding: 634, set: 630 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "rs" all_interface_variables: - &iv0 spirv_id: 3 @@ -391,43 +396,3194 @@ all_interface_variables: format: 98 # VK_FORMAT_R32_UINT type_description: *td4 word_offset: { location: 0 } -module: - generator: 14 # Google spiregg - entry_point_name: "MyRayGenMain" - entry_point_id: 1 - source_language: 5 # HLSL - source_language_version: 630 - spirv_execution_model: 5313 # RayGenerationKHR - shader_stage: 0x00000100 # RAYGEN - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "rs" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "rs" - input_variable_count: 14, - input_variables: - - *iv0 # - - *iv1 # - - *iv2 # - - *iv3 # - - *iv4 # - - *iv5 # - - *iv6 # - - *iv7 # - - *iv8 # - - *iv9 # - - *iv10 # - - *iv11 # - - *iv12 # - - *iv13 # - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: + - &iv14 + spirv_id: 3 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5319 # InLaunchIdKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 104 # VK_FORMAT_R32G32B32_UINT + type_description: *td1 + word_offset: { location: 0 } + - &iv15 + spirv_id: 4 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5320 # InLaunchSizeKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 104 # VK_FORMAT_R32G32B32_UINT + type_description: *td1 + word_offset: { location: 0 } + - &iv16 + spirv_id: 8 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5321 # InWorldRayOriginKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv17 + spirv_id: 9 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5322 # InWorldRayDirectionKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv18 + spirv_id: 10 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5325 # InRayTminKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 100 # VK_FORMAT_R32_SFLOAT + type_description: *td3 + word_offset: { location: 0 } + - &iv19 + spirv_id: 11 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5351 # InIncomingRayFlagsKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv20 + spirv_id: 13 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 6 # InstanceId + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv21 + spirv_id: 14 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5327 # InInstanceCustomIndexKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv22 + spirv_id: 15 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 7 # PrimitiveId + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv23 + spirv_id: 16 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5323 # InObjectRayOriginKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv24 + spirv_id: 17 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5324 # InObjectRayDirectionKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv25 + spirv_id: 18 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5330 # InObjectToWorldKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 4, row_count: 3, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td5 + word_offset: { location: 0 } + - &iv26 + spirv_id: 19 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5331 # InWorldToObjectKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 4, row_count: 3, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td5 + word_offset: { location: 0 } + - &iv27 + spirv_id: 22 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5333 # InHitKindKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv28 + spirv_id: 3 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5319 # InLaunchIdKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 104 # VK_FORMAT_R32G32B32_UINT + type_description: *td1 + word_offset: { location: 0 } + - &iv29 + spirv_id: 4 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5320 # InLaunchSizeKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 104 # VK_FORMAT_R32G32B32_UINT + type_description: *td1 + word_offset: { location: 0 } + - &iv30 + spirv_id: 8 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5321 # InWorldRayOriginKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv31 + spirv_id: 9 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5322 # InWorldRayDirectionKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv32 + spirv_id: 10 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5325 # InRayTminKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 100 # VK_FORMAT_R32_SFLOAT + type_description: *td3 + word_offset: { location: 0 } + - &iv33 + spirv_id: 11 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5351 # InIncomingRayFlagsKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv34 + spirv_id: 13 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 6 # InstanceId + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv35 + spirv_id: 14 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5327 # InInstanceCustomIndexKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv36 + spirv_id: 15 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 7 # PrimitiveId + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv37 + spirv_id: 16 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5323 # InObjectRayOriginKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv38 + spirv_id: 17 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5324 # InObjectRayDirectionKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv39 + spirv_id: 18 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5330 # InObjectToWorldKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 4, row_count: 3, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td5 + word_offset: { location: 0 } + - &iv40 + spirv_id: 19 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5331 # InWorldToObjectKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 4, row_count: 3, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td5 + word_offset: { location: 0 } + - &iv41 + spirv_id: 22 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5333 # InHitKindKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv42 + spirv_id: 3 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5319 # InLaunchIdKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 104 # VK_FORMAT_R32G32B32_UINT + type_description: *td1 + word_offset: { location: 0 } + - &iv43 + spirv_id: 4 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5320 # InLaunchSizeKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 104 # VK_FORMAT_R32G32B32_UINT + type_description: *td1 + word_offset: { location: 0 } + - &iv44 + spirv_id: 8 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5321 # InWorldRayOriginKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv45 + spirv_id: 9 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5322 # InWorldRayDirectionKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv46 + spirv_id: 10 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5325 # InRayTminKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 100 # VK_FORMAT_R32_SFLOAT + type_description: *td3 + word_offset: { location: 0 } + - &iv47 + spirv_id: 11 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5351 # InIncomingRayFlagsKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv48 + spirv_id: 13 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 6 # InstanceId + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv49 + spirv_id: 14 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5327 # InInstanceCustomIndexKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv50 + spirv_id: 15 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 7 # PrimitiveId + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv51 + spirv_id: 16 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5323 # InObjectRayOriginKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv52 + spirv_id: 17 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5324 # InObjectRayDirectionKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv53 + spirv_id: 18 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5330 # InObjectToWorldKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 4, row_count: 3, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td5 + word_offset: { location: 0 } + - &iv54 + spirv_id: 19 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5331 # InWorldToObjectKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 4, row_count: 3, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td5 + word_offset: { location: 0 } + - &iv55 + spirv_id: 22 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5333 # InHitKindKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv56 + spirv_id: 3 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5319 # InLaunchIdKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 104 # VK_FORMAT_R32G32B32_UINT + type_description: *td1 + word_offset: { location: 0 } + - &iv57 + spirv_id: 4 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5320 # InLaunchSizeKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 104 # VK_FORMAT_R32G32B32_UINT + type_description: *td1 + word_offset: { location: 0 } + - &iv58 + spirv_id: 8 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5321 # InWorldRayOriginKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv59 + spirv_id: 9 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5322 # InWorldRayDirectionKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv60 + spirv_id: 10 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5325 # InRayTminKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 100 # VK_FORMAT_R32_SFLOAT + type_description: *td3 + word_offset: { location: 0 } + - &iv61 + spirv_id: 11 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5351 # InIncomingRayFlagsKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv62 + spirv_id: 13 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 6 # InstanceId + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv63 + spirv_id: 14 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5327 # InInstanceCustomIndexKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv64 + spirv_id: 15 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 7 # PrimitiveId + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv65 + spirv_id: 16 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5323 # InObjectRayOriginKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv66 + spirv_id: 17 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5324 # InObjectRayDirectionKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv67 + spirv_id: 18 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5330 # InObjectToWorldKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 4, row_count: 3, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td5 + word_offset: { location: 0 } + - &iv68 + spirv_id: 19 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5331 # InWorldToObjectKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 4, row_count: 3, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td5 + word_offset: { location: 0 } + - &iv69 + spirv_id: 22 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5333 # InHitKindKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv70 + spirv_id: 3 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5319 # InLaunchIdKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 104 # VK_FORMAT_R32G32B32_UINT + type_description: *td1 + word_offset: { location: 0 } + - &iv71 + spirv_id: 4 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5320 # InLaunchSizeKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 104 # VK_FORMAT_R32G32B32_UINT + type_description: *td1 + word_offset: { location: 0 } + - &iv72 + spirv_id: 8 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5321 # InWorldRayOriginKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv73 + spirv_id: 9 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5322 # InWorldRayDirectionKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv74 + spirv_id: 10 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5325 # InRayTminKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 100 # VK_FORMAT_R32_SFLOAT + type_description: *td3 + word_offset: { location: 0 } + - &iv75 + spirv_id: 11 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5351 # InIncomingRayFlagsKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv76 + spirv_id: 13 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 6 # InstanceId + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv77 + spirv_id: 14 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5327 # InInstanceCustomIndexKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv78 + spirv_id: 15 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 7 # PrimitiveId + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv79 + spirv_id: 16 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5323 # InObjectRayOriginKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv80 + spirv_id: 17 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5324 # InObjectRayDirectionKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv81 + spirv_id: 18 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5330 # InObjectToWorldKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 4, row_count: 3, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td5 + word_offset: { location: 0 } + - &iv82 + spirv_id: 19 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5331 # InWorldToObjectKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 4, row_count: 3, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td5 + word_offset: { location: 0 } + - &iv83 + spirv_id: 22 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5333 # InHitKindKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv84 + spirv_id: 3 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5319 # InLaunchIdKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 104 # VK_FORMAT_R32G32B32_UINT + type_description: *td1 + word_offset: { location: 0 } + - &iv85 + spirv_id: 4 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5320 # InLaunchSizeKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 104 # VK_FORMAT_R32G32B32_UINT + type_description: *td1 + word_offset: { location: 0 } + - &iv86 + spirv_id: 8 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5321 # InWorldRayOriginKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv87 + spirv_id: 9 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5322 # InWorldRayDirectionKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv88 + spirv_id: 10 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5325 # InRayTminKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 100 # VK_FORMAT_R32_SFLOAT + type_description: *td3 + word_offset: { location: 0 } + - &iv89 + spirv_id: 11 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5351 # InIncomingRayFlagsKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv90 + spirv_id: 13 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 6 # InstanceId + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv91 + spirv_id: 14 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5327 # InInstanceCustomIndexKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv92 + spirv_id: 15 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 7 # PrimitiveId + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv93 + spirv_id: 16 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5323 # InObjectRayOriginKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv94 + spirv_id: 17 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5324 # InObjectRayDirectionKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv95 + spirv_id: 18 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5330 # InObjectToWorldKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 4, row_count: 3, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td5 + word_offset: { location: 0 } + - &iv96 + spirv_id: 19 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5331 # InWorldToObjectKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 4, row_count: 3, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td5 + word_offset: { location: 0 } + - &iv97 + spirv_id: 22 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5333 # InHitKindKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv98 + spirv_id: 3 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5319 # InLaunchIdKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 104 # VK_FORMAT_R32G32B32_UINT + type_description: *td1 + word_offset: { location: 0 } + - &iv99 + spirv_id: 4 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5320 # InLaunchSizeKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 104 # VK_FORMAT_R32G32B32_UINT + type_description: *td1 + word_offset: { location: 0 } + - &iv100 + spirv_id: 8 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5321 # InWorldRayOriginKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv101 + spirv_id: 9 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5322 # InWorldRayDirectionKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv102 + spirv_id: 10 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5325 # InRayTminKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 100 # VK_FORMAT_R32_SFLOAT + type_description: *td3 + word_offset: { location: 0 } + - &iv103 + spirv_id: 11 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5351 # InIncomingRayFlagsKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv104 + spirv_id: 13 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 6 # InstanceId + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv105 + spirv_id: 14 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5327 # InInstanceCustomIndexKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv106 + spirv_id: 15 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 7 # PrimitiveId + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv107 + spirv_id: 16 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5323 # InObjectRayOriginKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv108 + spirv_id: 17 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5324 # InObjectRayDirectionKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv109 + spirv_id: 18 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5330 # InObjectToWorldKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 4, row_count: 3, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td5 + word_offset: { location: 0 } + - &iv110 + spirv_id: 19 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5331 # InWorldToObjectKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 4, row_count: 3, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td5 + word_offset: { location: 0 } + - &iv111 + spirv_id: 22 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5333 # InHitKindKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv112 + spirv_id: 3 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5319 # InLaunchIdKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 104 # VK_FORMAT_R32G32B32_UINT + type_description: *td1 + word_offset: { location: 0 } + - &iv113 + spirv_id: 4 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5320 # InLaunchSizeKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 104 # VK_FORMAT_R32G32B32_UINT + type_description: *td1 + word_offset: { location: 0 } + - &iv114 + spirv_id: 8 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5321 # InWorldRayOriginKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv115 + spirv_id: 9 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5322 # InWorldRayDirectionKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv116 + spirv_id: 10 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5325 # InRayTminKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 100 # VK_FORMAT_R32_SFLOAT + type_description: *td3 + word_offset: { location: 0 } + - &iv117 + spirv_id: 11 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5351 # InIncomingRayFlagsKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv118 + spirv_id: 13 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 6 # InstanceId + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv119 + spirv_id: 14 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5327 # InInstanceCustomIndexKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv120 + spirv_id: 15 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 7 # PrimitiveId + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv121 + spirv_id: 16 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5323 # InObjectRayOriginKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv122 + spirv_id: 17 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5324 # InObjectRayDirectionKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv123 + spirv_id: 18 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5330 # InObjectToWorldKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 4, row_count: 3, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td5 + word_offset: { location: 0 } + - &iv124 + spirv_id: 19 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5331 # InWorldToObjectKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 4, row_count: 3, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td5 + word_offset: { location: 0 } + - &iv125 + spirv_id: 22 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5333 # InHitKindKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv126 + spirv_id: 3 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5319 # InLaunchIdKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 104 # VK_FORMAT_R32G32B32_UINT + type_description: *td1 + word_offset: { location: 0 } + - &iv127 + spirv_id: 4 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5320 # InLaunchSizeKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 104 # VK_FORMAT_R32G32B32_UINT + type_description: *td1 + word_offset: { location: 0 } + - &iv128 + spirv_id: 8 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5321 # InWorldRayOriginKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv129 + spirv_id: 9 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5322 # InWorldRayDirectionKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv130 + spirv_id: 10 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5325 # InRayTminKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 100 # VK_FORMAT_R32_SFLOAT + type_description: *td3 + word_offset: { location: 0 } + - &iv131 + spirv_id: 11 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5351 # InIncomingRayFlagsKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv132 + spirv_id: 13 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 6 # InstanceId + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv133 + spirv_id: 14 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5327 # InInstanceCustomIndexKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv134 + spirv_id: 15 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 7 # PrimitiveId + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv135 + spirv_id: 16 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5323 # InObjectRayOriginKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv136 + spirv_id: 17 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5324 # InObjectRayDirectionKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv137 + spirv_id: 18 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5330 # InObjectToWorldKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 4, row_count: 3, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td5 + word_offset: { location: 0 } + - &iv138 + spirv_id: 19 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5331 # InWorldToObjectKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 4, row_count: 3, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td5 + word_offset: { location: 0 } + - &iv139 + spirv_id: 22 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5333 # InHitKindKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv140 + spirv_id: 3 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5319 # InLaunchIdKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 104 # VK_FORMAT_R32G32B32_UINT + type_description: *td1 + word_offset: { location: 0 } + - &iv141 + spirv_id: 4 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5320 # InLaunchSizeKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 104 # VK_FORMAT_R32G32B32_UINT + type_description: *td1 + word_offset: { location: 0 } + - &iv142 + spirv_id: 8 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5321 # InWorldRayOriginKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv143 + spirv_id: 9 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5322 # InWorldRayDirectionKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv144 + spirv_id: 10 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5325 # InRayTminKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 100 # VK_FORMAT_R32_SFLOAT + type_description: *td3 + word_offset: { location: 0 } + - &iv145 + spirv_id: 11 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5351 # InIncomingRayFlagsKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv146 + spirv_id: 13 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 6 # InstanceId + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv147 + spirv_id: 14 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5327 # InInstanceCustomIndexKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv148 + spirv_id: 15 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 7 # PrimitiveId + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv149 + spirv_id: 16 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5323 # InObjectRayOriginKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv150 + spirv_id: 17 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5324 # InObjectRayDirectionKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv151 + spirv_id: 18 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5330 # InObjectToWorldKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 4, row_count: 3, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td5 + word_offset: { location: 0 } + - &iv152 + spirv_id: 19 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5331 # InWorldToObjectKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 4, row_count: 3, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td5 + word_offset: { location: 0 } + - &iv153 + spirv_id: 22 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5333 # InHitKindKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv154 + spirv_id: 3 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5319 # InLaunchIdKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 104 # VK_FORMAT_R32G32B32_UINT + type_description: *td1 + word_offset: { location: 0 } + - &iv155 + spirv_id: 4 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5320 # InLaunchSizeKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 104 # VK_FORMAT_R32G32B32_UINT + type_description: *td1 + word_offset: { location: 0 } + - &iv156 + spirv_id: 8 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5321 # InWorldRayOriginKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv157 + spirv_id: 9 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5322 # InWorldRayDirectionKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv158 + spirv_id: 10 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5325 # InRayTminKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 100 # VK_FORMAT_R32_SFLOAT + type_description: *td3 + word_offset: { location: 0 } + - &iv159 + spirv_id: 11 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5351 # InIncomingRayFlagsKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv160 + spirv_id: 13 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 6 # InstanceId + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv161 + spirv_id: 14 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5327 # InInstanceCustomIndexKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv162 + spirv_id: 15 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 7 # PrimitiveId + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } + - &iv163 + spirv_id: 16 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5323 # InObjectRayOriginKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv164 + spirv_id: 17 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5324 # InObjectRayDirectionKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td2 + word_offset: { location: 0 } + - &iv165 + spirv_id: 18 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5330 # InObjectToWorldKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 4, row_count: 3, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td5 + word_offset: { location: 0 } + - &iv166 + spirv_id: 19 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5331 # InWorldToObjectKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 3 } + matrix: { column_count: 4, row_count: 3, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 106 # VK_FORMAT_R32G32B32_SFLOAT + type_description: *td5 + word_offset: { location: 0 } + - &iv167 + spirv_id: 22 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 5333 # InHitKindKHR + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td4 + word_offset: { location: 0 } +module: + generator: 14 # Google spiregg + entry_point_name: "MyRayGenMain" + entry_point_id: 1 + entry_point_count: 12 + entry_points: + - name: "MyRayGenMain" + id: 1 + spirv_execution_model: 5313 # RayGenerationKHR + shader_stage: 0x00000100 # RAYGEN + input_variable_count: 14 + input_variables: + - *iv0 # + - *iv1 # + - *iv2 # + - *iv3 # + - *iv4 # + - *iv5 # + - *iv6 # + - *iv7 # + - *iv8 # + - *iv9 # + - *iv10 # + - *iv11 # + - *iv12 # + - *iv13 # + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "rs" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "rs" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 + - name: "MyRayGenMain2" + id: 28 + spirv_execution_model: 5313 # RayGenerationKHR + shader_stage: 0x00000100 # RAYGEN + input_variable_count: 14 + input_variables: + - *iv14 # + - *iv15 # + - *iv16 # + - *iv17 # + - *iv18 # + - *iv19 # + - *iv20 # + - *iv21 # + - *iv22 # + - *iv23 # + - *iv24 # + - *iv25 # + - *iv26 # + - *iv27 # + output_variable_count: 0 + output_variables: + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 + - name: "MyMissMain" + id: 29 + spirv_execution_model: 5317 # MissKHR + shader_stage: 0x00000800 # MISS + input_variable_count: 14 + input_variables: + - *iv28 # + - *iv29 # + - *iv30 # + - *iv31 # + - *iv32 # + - *iv33 # + - *iv34 # + - *iv35 # + - *iv36 # + - *iv37 # + - *iv38 # + - *iv39 # + - *iv40 # + - *iv41 # + output_variable_count: 0 + output_variables: + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 + - name: "MyMissMain2" + id: 30 + spirv_execution_model: 5317 # MissKHR + shader_stage: 0x00000800 # MISS + input_variable_count: 14 + input_variables: + - *iv42 # + - *iv43 # + - *iv44 # + - *iv45 # + - *iv46 # + - *iv47 # + - *iv48 # + - *iv49 # + - *iv50 # + - *iv51 # + - *iv52 # + - *iv53 # + - *iv54 # + - *iv55 # + output_variable_count: 0 + output_variables: + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 + - name: "MyISecMain" + id: 31 + spirv_execution_model: 5314 # IntersectionKHR + shader_stage: 0x00001000 # INTERSECTION + input_variable_count: 14 + input_variables: + - *iv56 # + - *iv57 # + - *iv58 # + - *iv59 # + - *iv60 # + - *iv61 # + - *iv62 # + - *iv63 # + - *iv64 # + - *iv65 # + - *iv66 # + - *iv67 # + - *iv68 # + - *iv69 # + output_variable_count: 0 + output_variables: + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 + - name: "MyISecMain2" + id: 32 + spirv_execution_model: 5314 # IntersectionKHR + shader_stage: 0x00001000 # INTERSECTION + input_variable_count: 14 + input_variables: + - *iv70 # + - *iv71 # + - *iv72 # + - *iv73 # + - *iv74 # + - *iv75 # + - *iv76 # + - *iv77 # + - *iv78 # + - *iv79 # + - *iv80 # + - *iv81 # + - *iv82 # + - *iv83 # + output_variable_count: 0 + output_variables: + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 + - name: "MyAHitMain" + id: 33 + spirv_execution_model: 5315 # AnyHitKHR + shader_stage: 0x00000200 # ANY_HIT + input_variable_count: 14 + input_variables: + - *iv84 # + - *iv85 # + - *iv86 # + - *iv87 # + - *iv88 # + - *iv89 # + - *iv90 # + - *iv91 # + - *iv92 # + - *iv93 # + - *iv94 # + - *iv95 # + - *iv96 # + - *iv97 # + output_variable_count: 0 + output_variables: + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 + - name: "MyAHitMain2" + id: 34 + spirv_execution_model: 5315 # AnyHitKHR + shader_stage: 0x00000200 # ANY_HIT + input_variable_count: 14 + input_variables: + - *iv98 # + - *iv99 # + - *iv100 # + - *iv101 # + - *iv102 # + - *iv103 # + - *iv104 # + - *iv105 # + - *iv106 # + - *iv107 # + - *iv108 # + - *iv109 # + - *iv110 # + - *iv111 # + output_variable_count: 0 + output_variables: + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 + - name: "MyCHitMain" + id: 35 + spirv_execution_model: 5316 # ClosestHitKHR + shader_stage: 0x00000400 # CLOSEST_HIT + input_variable_count: 14 + input_variables: + - *iv112 # + - *iv113 # + - *iv114 # + - *iv115 # + - *iv116 # + - *iv117 # + - *iv118 # + - *iv119 # + - *iv120 # + - *iv121 # + - *iv122 # + - *iv123 # + - *iv124 # + - *iv125 # + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "rs" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "rs" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 + - name: "MyCHitMain2" + id: 36 + spirv_execution_model: 5316 # ClosestHitKHR + shader_stage: 0x00000400 # CLOSEST_HIT + input_variable_count: 14 + input_variables: + - *iv126 # + - *iv127 # + - *iv128 # + - *iv129 # + - *iv130 # + - *iv131 # + - *iv132 # + - *iv133 # + - *iv134 # + - *iv135 # + - *iv136 # + - *iv137 # + - *iv138 # + - *iv139 # + output_variable_count: 0 + output_variables: + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 + - name: "MyCallMain" + id: 37 + spirv_execution_model: 5318 # CallableKHR + shader_stage: 0x00002000 # CALLABLE + input_variable_count: 14 + input_variables: + - *iv140 # + - *iv141 # + - *iv142 # + - *iv143 # + - *iv144 # + - *iv145 # + - *iv146 # + - *iv147 # + - *iv148 # + - *iv149 # + - *iv150 # + - *iv151 # + - *iv152 # + - *iv153 # + output_variable_count: 0 + output_variables: + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 + - name: "MyCallMain2" + id: 38 + spirv_execution_model: 5318 # CallableKHR + shader_stage: 0x00002000 # CALLABLE + input_variable_count: 14 + input_variables: + - *iv154 # + - *iv155 # + - *iv156 # + - *iv157 # + - *iv158 # + - *iv159 # + - *iv160 # + - *iv161 # + - *iv162 # + - *iv163 # + - *iv164 # + - *iv165 # + - *iv166 # + - *iv167 # + output_variable_count: 0 + output_variables: + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 + source_language: 5 # HLSL + source_language_version: 630 + spirv_execution_model: 5313 # RayGenerationKHR + shader_stage: 0x00000100 # RAYGEN specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/raytrace/raytracing.nv.miss.spv.yaml b/tests/raytrace/raytracing.nv.miss.spv.yaml index 20c5a08..2f44419 100644 --- a/tests/raytrace/raytracing.nv.miss.spv.yaml +++ b/tests/raytrace/raytracing.nv.miss.spv.yaml @@ -71,6 +71,7 @@ all_type_descriptions: members: all_block_variables: all_descriptor_bindings: +all_descriptor_sets: all_interface_variables: - &iv0 spirv_id: 3 @@ -184,26 +185,37 @@ module: generator: 14 # Google spiregg entry_point_name: "main" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "main" + id: 1 + spirv_execution_model: 5317 # MissKHR + shader_stage: 0x00000800 # MISS + input_variable_count: 6 + input_variables: + - *iv0 # + - *iv1 # + - *iv2 # + - *iv3 # + - *iv4 # + - *iv5 # + output_variable_count: 0 + output_variables: + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 630 spirv_execution_model: 5317 # MissKHR shader_stage: 0x00000800 # MISS - descriptor_binding_count: 0 - descriptor_bindings: - descriptor_set_count: 0 - descriptor_sets: - input_variable_count: 6, - input_variables: - - *iv0 # - - *iv1 # - - *iv2 # - - *iv3 # - - *iv4 # - - *iv5 # - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/raytrace/raytracing.nv.raygen.spv.yaml b/tests/raytrace/raytracing.nv.raygen.spv.yaml index 2dbac18..3eb7c87 100644 --- a/tests/raytrace/raytracing.nv.raygen.spv.yaml +++ b/tests/raytrace/raytracing.nv.raygen.spv.yaml @@ -70,6 +70,11 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td0 word_offset: { binding: 96, set: 92 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "rs" all_interface_variables: - &iv0 spirv_id: 3 @@ -111,27 +116,38 @@ module: generator: 14 # Google spiregg entry_point_name: "main" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "main" + id: 1 + spirv_execution_model: 5313 # RayGenerationKHR + shader_stage: 0x00000100 # RAYGEN + input_variable_count: 2 + input_variables: + - *iv0 # + - *iv1 # + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "rs" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "rs" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 630 spirv_execution_model: 5313 # RayGenerationKHR shader_stage: 0x00000100 # RAYGEN - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "rs" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "rs" - input_variable_count: 2, - input_variables: - - *iv0 # - - *iv1 # - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/spec_constants/basic.spv.yaml b/tests/spec_constants/basic.spv.yaml index f15705c..96a3606 100644 --- a/tests/spec_constants/basic.spv.yaml +++ b/tests/spec_constants/basic.spv.yaml @@ -123,30 +123,46 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td2 word_offset: { binding: 83, set: 79 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "ssbo" all_interface_variables: module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "ssbo" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "ssbo" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [17] + local_size: [1, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 450 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "ssbo" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "ssbo" - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 1, specialization_constants: - name: "SIZE" diff --git a/tests/spec_constants/convert.spv.yaml b/tests/spec_constants/convert.spv.yaml index 8615964..a4ffc73 100644 --- a/tests/spec_constants/convert.spv.yaml +++ b/tests/spec_constants/convert.spv.yaml @@ -483,36 +483,55 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td11 word_offset: { binding: 278, set: 274 } +all_descriptor_sets: + - set: 0 + binding_count: 4 + bindings: + - *db0 # "U_Sone" + - *db1 # "U_Uone" + - *db2 # "S_Sone" + - *db3 # "S_Uone" all_interface_variables: module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 4 + bindings: + - *db0 # "U_Sone" + - *db1 # "U_Uone" + - *db2 # "S_Sone" + - *db3 # "S_Uone" + used_descriptor_binding_count: 4 + used_descriptor_bindings: + - *db0 # "U_Sone" + - *db1 # "U_Uone" + - *db2 # "S_Sone" + - *db3 # "S_Uone" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [17] + local_size: [1, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 450 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 4 - descriptor_bindings: - - *db0 # "U_Sone" - - *db1 # "U_Uone" - - *db2 # "S_Sone" - - *db3 # "S_Uone" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 4 - bindings: - - *db0 # "U_Sone" - - *db1 # "U_Uone" - - *db2 # "S_Sone" - - *db3 # "S_Uone" - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 4, specialization_constants: - name: "SONE" diff --git a/tests/spec_constants/local_size_id_10.spv.yaml b/tests/spec_constants/local_size_id_10.spv.yaml index ff5476d..ae855a9 100644 --- a/tests/spec_constants/local_size_id_10.spv.yaml +++ b/tests/spec_constants/local_size_id_10.spv.yaml @@ -3,25 +3,37 @@ all_type_descriptions: all_block_variables: all_descriptor_bindings: +all_descriptor_sets: all_interface_variables: module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [17] + local_size: [1, 1, 4] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 450 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 0 - descriptor_bindings: - descriptor_set_count: 0 - descriptor_sets: - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 2, specialization_constants: - name: diff --git a/tests/spec_constants/local_size_id_13.spv.yaml b/tests/spec_constants/local_size_id_13.spv.yaml index 7180f52..fe5c145 100644 --- a/tests/spec_constants/local_size_id_13.spv.yaml +++ b/tests/spec_constants/local_size_id_13.spv.yaml @@ -3,25 +3,37 @@ all_type_descriptions: all_block_variables: all_descriptor_bindings: +all_descriptor_sets: all_interface_variables: module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [0] + local_size: [4294967295, 4294967295, 4] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 450 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 0 - descriptor_bindings: - descriptor_set_count: 0 - descriptor_sets: - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 4, specialization_constants: - name: diff --git a/tests/spec_constants/ssbo_array.spv.yaml b/tests/spec_constants/ssbo_array.spv.yaml index 20bc96f..eb81de1 100644 --- a/tests/spec_constants/ssbo_array.spv.yaml +++ b/tests/spec_constants/ssbo_array.spv.yaml @@ -123,30 +123,46 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td2 word_offset: { binding: 94, set: 90 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "ssbo" all_interface_variables: module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "ssbo" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "ssbo" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [17] + local_size: [1, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 450 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "ssbo" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "ssbo" - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 2, specialization_constants: - name: "SIZE_A" diff --git a/tests/spec_constants/test_32bit.spv.yaml b/tests/spec_constants/test_32bit.spv.yaml index 058be88..ed4b6cf 100644 --- a/tests/spec_constants/test_32bit.spv.yaml +++ b/tests/spec_constants/test_32bit.spv.yaml @@ -3723,50 +3723,7 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td92 word_offset: { binding: 1564, set: 1560 } -all_interface_variables: -module: - generator: 7 # Khronos SPIR-V Tools Assembler - entry_point_name: "main" - entry_point_id: 2 - source_language: 2 # GLSL - source_language_version: 450 - spirv_execution_model: 5 # GLCompute - shader_stage: 0x00000020 # CS - descriptor_binding_count: 31 - descriptor_bindings: - - *db0 # "IAdd" - - *db1 # "ISub" - - *db2 # "IMul" - - *db3 # "UDiv" - - *db4 # "SDiv" - - *db5 # "SRem" - - *db6 # "SMod" - - *db7 # "UMod" - - *db8 # "LShl" - - *db9 # "RShl" - - *db10 # "RSha" - - *db11 # "IEq" - - *db12 # "INeq" - - *db13 # "Ult" - - *db14 # "Ule" - - *db15 # "Ugt" - - *db16 # "Uge" - - *db17 # "Slt" - - *db18 # "Sle" - - *db19 # "Sgt" - - *db20 # "Sge" - - *db21 # "Lor" - - *db22 # "Land" - - *db23 # "Lnot" - - *db24 # "And" - - *db25 # "Or" - - *db26 # "Xor" - - *db27 # "Not" - - *db28 # "Leq" - - *db29 # "Lneq" - - *db30 # "Sel" - descriptor_set_count: 1 - descriptor_sets: +all_descriptor_sets: - set: 0 binding_count: 31 bindings: @@ -3801,12 +3758,101 @@ module: - *db28 # "Leq" - *db29 # "Lneq" - *db30 # "Sel" - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: +all_interface_variables: +module: + generator: 7 # Khronos SPIR-V Tools Assembler + entry_point_name: "main" + entry_point_id: 2 + entry_point_count: 1 + entry_points: + - name: "main" + id: 2 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 31 + bindings: + - *db0 # "IAdd" + - *db1 # "ISub" + - *db2 # "IMul" + - *db3 # "UDiv" + - *db4 # "SDiv" + - *db5 # "SRem" + - *db6 # "SMod" + - *db7 # "UMod" + - *db8 # "LShl" + - *db9 # "RShl" + - *db10 # "RSha" + - *db11 # "IEq" + - *db12 # "INeq" + - *db13 # "Ult" + - *db14 # "Ule" + - *db15 # "Ugt" + - *db16 # "Uge" + - *db17 # "Slt" + - *db18 # "Sle" + - *db19 # "Sgt" + - *db20 # "Sge" + - *db21 # "Lor" + - *db22 # "Land" + - *db23 # "Lnot" + - *db24 # "And" + - *db25 # "Or" + - *db26 # "Xor" + - *db27 # "Not" + - *db28 # "Leq" + - *db29 # "Lneq" + - *db30 # "Sel" + used_descriptor_binding_count: 31 + used_descriptor_bindings: + - *db0 # "IAdd" + - *db1 # "ISub" + - *db2 # "IMul" + - *db3 # "UDiv" + - *db4 # "SDiv" + - *db5 # "SRem" + - *db6 # "SMod" + - *db7 # "UMod" + - *db8 # "LShl" + - *db9 # "RShl" + - *db10 # "RSha" + - *db11 # "IEq" + - *db12 # "INeq" + - *db13 # "Ult" + - *db14 # "Ule" + - *db15 # "Ugt" + - *db16 # "Uge" + - *db17 # "Slt" + - *db18 # "Sle" + - *db19 # "Sgt" + - *db20 # "Sge" + - *db21 # "Lor" + - *db22 # "Land" + - *db23 # "Lnot" + - *db24 # "And" + - *db25 # "Or" + - *db26 # "Xor" + - *db27 # "Not" + - *db28 # "Leq" + - *db29 # "Lneq" + - *db30 # "Sel" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [17] + local_size: [2, 3, 4] + invocations: 0 + output_vertices: 0 + source_language: 2 # GLSL + source_language_version: 450 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS specialization_constant_count: 9, specialization_constants: - name: "SONE" diff --git a/tests/spec_constants/test_64bit.spv.yaml b/tests/spec_constants/test_64bit.spv.yaml index 7fad803..08c4af1 100644 --- a/tests/spec_constants/test_64bit.spv.yaml +++ b/tests/spec_constants/test_64bit.spv.yaml @@ -3723,50 +3723,7 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td92 word_offset: { binding: 1566, set: 1562 } -all_interface_variables: -module: - generator: 7 # Khronos SPIR-V Tools Assembler - entry_point_name: "main" - entry_point_id: 2 - source_language: 2 # GLSL - source_language_version: 450 - spirv_execution_model: 5 # GLCompute - shader_stage: 0x00000020 # CS - descriptor_binding_count: 31 - descriptor_bindings: - - *db0 # "IAdd" - - *db1 # "ISub" - - *db2 # "IMul" - - *db3 # "UDiv" - - *db4 # "SDiv" - - *db5 # "SRem" - - *db6 # "SMod" - - *db7 # "UMod" - - *db8 # "LShl" - - *db9 # "RShl" - - *db10 # "RSha" - - *db11 # "IEq" - - *db12 # "INeq" - - *db13 # "Ult" - - *db14 # "Ule" - - *db15 # "Ugt" - - *db16 # "Uge" - - *db17 # "Slt" - - *db18 # "Sle" - - *db19 # "Sgt" - - *db20 # "Sge" - - *db21 # "Lor" - - *db22 # "Land" - - *db23 # "Lnot" - - *db24 # "And" - - *db25 # "Or" - - *db26 # "Xor" - - *db27 # "Not" - - *db28 # "Leq" - - *db29 # "Lneq" - - *db30 # "Sel" - descriptor_set_count: 1 - descriptor_sets: +all_descriptor_sets: - set: 0 binding_count: 31 bindings: @@ -3801,12 +3758,101 @@ module: - *db28 # "Leq" - *db29 # "Lneq" - *db30 # "Sel" - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: +all_interface_variables: +module: + generator: 7 # Khronos SPIR-V Tools Assembler + entry_point_name: "main" + entry_point_id: 2 + entry_point_count: 1 + entry_points: + - name: "main" + id: 2 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 31 + bindings: + - *db0 # "IAdd" + - *db1 # "ISub" + - *db2 # "IMul" + - *db3 # "UDiv" + - *db4 # "SDiv" + - *db5 # "SRem" + - *db6 # "SMod" + - *db7 # "UMod" + - *db8 # "LShl" + - *db9 # "RShl" + - *db10 # "RSha" + - *db11 # "IEq" + - *db12 # "INeq" + - *db13 # "Ult" + - *db14 # "Ule" + - *db15 # "Ugt" + - *db16 # "Uge" + - *db17 # "Slt" + - *db18 # "Sle" + - *db19 # "Sgt" + - *db20 # "Sge" + - *db21 # "Lor" + - *db22 # "Land" + - *db23 # "Lnot" + - *db24 # "And" + - *db25 # "Or" + - *db26 # "Xor" + - *db27 # "Not" + - *db28 # "Leq" + - *db29 # "Lneq" + - *db30 # "Sel" + used_descriptor_binding_count: 31 + used_descriptor_bindings: + - *db0 # "IAdd" + - *db1 # "ISub" + - *db2 # "IMul" + - *db3 # "UDiv" + - *db4 # "SDiv" + - *db5 # "SRem" + - *db6 # "SMod" + - *db7 # "UMod" + - *db8 # "LShl" + - *db9 # "RShl" + - *db10 # "RSha" + - *db11 # "IEq" + - *db12 # "INeq" + - *db13 # "Ult" + - *db14 # "Ule" + - *db15 # "Ugt" + - *db16 # "Uge" + - *db17 # "Slt" + - *db18 # "Sle" + - *db19 # "Sgt" + - *db20 # "Sge" + - *db21 # "Lor" + - *db22 # "Land" + - *db23 # "Lnot" + - *db24 # "And" + - *db25 # "Or" + - *db26 # "Xor" + - *db27 # "Not" + - *db28 # "Leq" + - *db29 # "Lneq" + - *db30 # "Sel" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [17] + local_size: [2, 3, 4] + invocations: 0 + output_vertices: 0 + source_language: 2 # GLSL + source_language_version: 450 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS specialization_constant_count: 9, specialization_constants: - name: "SONE" diff --git a/tests/spirv15/VertexShader.spv.yaml b/tests/spirv15/VertexShader.spv.yaml index 5e664a1..1f24231 100644 --- a/tests/spirv15/VertexShader.spv.yaml +++ b/tests/spirv15/VertexShader.spv.yaml @@ -87,6 +87,11 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td0 word_offset: { binding: 76, set: 72 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "Tex0" all_interface_variables: - &iv0 spirv_id: 2 @@ -164,29 +169,40 @@ module: generator: 14 # Google spiregg entry_point_name: "vsmain" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "vsmain" + id: 1 + spirv_execution_model: 0 # Vertex + shader_stage: 0x00000001 # VS + input_variable_count: 3 + input_variables: + - *iv0 # "in.var.POSITION" + - *iv1 # + - *iv2 # + output_variable_count: 1 + output_variables: + - *iv3 # + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "Tex0" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "Tex0" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 600 spirv_execution_model: 0 # Vertex shader_stage: 0x00000001 # VS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "Tex0" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "Tex0" - input_variable_count: 3, - input_variables: - - *iv0 # "in.var.POSITION" - - *iv1 # - - *iv2 # - output_variable_count: 1, - output_variables: - - *iv3 # - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/user_type/byte_address_buffer_0.spv.yaml b/tests/user_type/byte_address_buffer_0.spv.yaml index c12d087..4c614c4 100644 --- a/tests/user_type/byte_address_buffer_0.spv.yaml +++ b/tests/user_type/byte_address_buffer_0.spv.yaml @@ -107,6 +107,11 @@ all_descriptor_bindings: type_description: *td1 word_offset: { binding: 129, set: 125 } user_type: ByteAddressBuffer +all_descriptor_sets: + - set: 1 + binding_count: 1 + bindings: + - *db0 # "g_MaterialData" all_interface_variables: - &iv0 spirv_id: 2 @@ -126,30 +131,79 @@ all_interface_variables: format: 98 # VK_FORMAT_R32_UINT type_description: *td2 word_offset: { location: 0 } + - &iv1 + spirv_id: 2 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 6 # InstanceId + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td2 + word_offset: { location: 0 } module: generator: 14 # Google spiregg entry_point_name: "ClosestHit0" entry_point_id: 1 + entry_point_count: 2 + entry_points: + - name: "ClosestHit0" + id: 1 + spirv_execution_model: 5316 # ClosestHitKHR + shader_stage: 0x00000400 # CLOSEST_HIT + input_variable_count: 1 + input_variables: + - *iv0 # + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 1 + binding_count: 1 + bindings: + - *db0 # "g_MaterialData" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "g_MaterialData" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 + - name: "AnyHit1" + id: 6 + spirv_execution_model: 5315 # AnyHitKHR + shader_stage: 0x00000200 # ANY_HIT + input_variable_count: 1 + input_variables: + - *iv1 # + output_variable_count: 0 + output_variables: + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 640 spirv_execution_model: 5316 # ClosestHitKHR shader_stage: 0x00000400 # CLOSEST_HIT - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "g_MaterialData" - descriptor_set_count: 1 - descriptor_sets: - - set: 1 - binding_count: 1 - bindings: - - *db0 # "g_MaterialData" - input_variable_count: 1, - input_variables: - - *iv0 # - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/user_type/byte_address_buffer_1.spv.yaml b/tests/user_type/byte_address_buffer_1.spv.yaml index 735636b..184d844 100644 --- a/tests/user_type/byte_address_buffer_1.spv.yaml +++ b/tests/user_type/byte_address_buffer_1.spv.yaml @@ -278,6 +278,16 @@ all_descriptor_bindings: type_description: *td5 word_offset: { binding: 112, set: 108 } user_type: ByteAddressBuffer +all_descriptor_sets: + - set: 0 + binding_count: 2 + bindings: + - *db0 # "$Globals" + - *db1 # "Output" + - set: 1 + binding_count: 1 + bindings: + - *db2 # "g_MaterialData" all_interface_variables: - &iv0 spirv_id: 2 @@ -301,33 +311,44 @@ module: generator: 14 # Google spiregg entry_point_name: "csmain" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "csmain" + id: 1 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 1 + input_variables: + - *iv0 # + output_variable_count: 0 + output_variables: + descriptor_set_count: 2 + descriptor_sets: + - set: 0 + binding_count: 2 + bindings: + - *db0 # "$Globals" + - *db1 # "Output" + - set: 1 + binding_count: 1 + bindings: + - *db2 # "g_MaterialData" + used_descriptor_binding_count: 3 + used_descriptor_bindings: + - *db0 # "$Globals" + - *db2 # "g_MaterialData" + - *db1 # "Output" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [17] + local_size: [1, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 600 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 3 - descriptor_bindings: - - *db0 # "$Globals" - - *db1 # "Output" - - *db2 # "g_MaterialData" - descriptor_set_count: 2 - descriptor_sets: - - set: 0 - binding_count: 2 - bindings: - - *db0 # "$Globals" - - *db1 # "Output" - - set: 1 - binding_count: 1 - bindings: - - *db2 # "g_MaterialData" - input_variable_count: 1, - input_variables: - - *iv0 # - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/user_type/byte_address_buffer_2.spv.yaml b/tests/user_type/byte_address_buffer_2.spv.yaml index 4b7b92a..d670cfa 100644 --- a/tests/user_type/byte_address_buffer_2.spv.yaml +++ b/tests/user_type/byte_address_buffer_2.spv.yaml @@ -193,6 +193,15 @@ all_descriptor_bindings: type_description: *td3 word_offset: { binding: 94, set: 90 } user_type: ByteAddressBuffer +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "Output" + - set: 1 + binding_count: 1 + bindings: + - *db1 # "g_MaterialData" all_interface_variables: - &iv0 spirv_id: 2 @@ -216,31 +225,42 @@ module: generator: 14 # Google spiregg entry_point_name: "csmain" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "csmain" + id: 1 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 1 + input_variables: + - *iv0 # + output_variable_count: 0 + output_variables: + descriptor_set_count: 2 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "Output" + - set: 1 + binding_count: 1 + bindings: + - *db1 # "g_MaterialData" + used_descriptor_binding_count: 2 + used_descriptor_bindings: + - *db1 # "g_MaterialData" + - *db0 # "Output" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [17] + local_size: [1, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 600 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 2 - descriptor_bindings: - - *db0 # "Output" - - *db1 # "g_MaterialData" - descriptor_set_count: 2 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "Output" - - set: 1 - binding_count: 1 - bindings: - - *db1 # "g_MaterialData" - input_variable_count: 1, - input_variables: - - *iv0 # - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/user_type/byte_address_buffer_3.spv.yaml b/tests/user_type/byte_address_buffer_3.spv.yaml index a171200..7d8f66a 100644 --- a/tests/user_type/byte_address_buffer_3.spv.yaml +++ b/tests/user_type/byte_address_buffer_3.spv.yaml @@ -107,6 +107,11 @@ all_descriptor_bindings: type_description: *td1 word_offset: { binding: 107, set: 103 } user_type: ByteAddressBuffer +all_descriptor_sets: + - set: 1 + binding_count: 1 + bindings: + - *db0 # "g_MaterialData" all_interface_variables: - &iv0 spirv_id: 2 @@ -126,30 +131,84 @@ all_interface_variables: format: 98 # VK_FORMAT_R32_UINT type_description: *td2 word_offset: { location: 0 } + - &iv1 + spirv_id: 2 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 6 # InstanceId + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td2 + word_offset: { location: 0 } module: generator: 7 # Khronos SPIR-V Tools Assembler entry_point_name: "AnyHit1" entry_point_id: 1 + entry_point_count: 2 + entry_points: + - name: "AnyHit1" + id: 1 + spirv_execution_model: 5315 # AnyHitKHR + shader_stage: 0x00000200 # ANY_HIT + input_variable_count: 1 + input_variables: + - *iv0 # + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 1 + binding_count: 1 + bindings: + - *db0 # "g_MaterialData" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "g_MaterialData" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 + - name: "AnyHit0" + id: 6 + spirv_execution_model: 5315 # AnyHitKHR + shader_stage: 0x00000200 # ANY_HIT + input_variable_count: 1 + input_variables: + - *iv1 # + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 1 + binding_count: 1 + bindings: + - *db0 # "g_MaterialData" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "g_MaterialData" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 640 spirv_execution_model: 5315 # AnyHitKHR shader_stage: 0x00000200 # ANY_HIT - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "g_MaterialData" - descriptor_set_count: 1 - descriptor_sets: - - set: 1 - binding_count: 1 - bindings: - - *db0 # "g_MaterialData" - input_variable_count: 1, - input_variables: - - *iv0 # - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/user_type/rw_byte_address_buffer.spv.yaml b/tests/user_type/rw_byte_address_buffer.spv.yaml index 700c731..4e38442 100644 --- a/tests/user_type/rw_byte_address_buffer.spv.yaml +++ b/tests/user_type/rw_byte_address_buffer.spv.yaml @@ -107,6 +107,11 @@ all_descriptor_bindings: type_description: *td1 word_offset: { binding: 130, set: 126 } user_type: RWByteAddressBuffer +all_descriptor_sets: + - set: 1 + binding_count: 1 + bindings: + - *db0 # "g_MaterialData" all_interface_variables: - &iv0 spirv_id: 2 @@ -126,30 +131,79 @@ all_interface_variables: format: 98 # VK_FORMAT_R32_UINT type_description: *td2 word_offset: { location: 0 } + - &iv1 + spirv_id: 2 + name: + location: 4294967295 + storage_class: 1 # Input + semantic: + decoration_flags: 0x00000010 # BUILT_IN + built_in: 6 # InstanceId + numeric: + scalar: { width: 32, signedness: 0 } + vector: { component_count: 0 } + matrix: { column_count: 0, row_count: 0, stride: 0 } + array: { dims_count: 0, dims: [], stride: 0 } + member_count: 0 + members: + format: 98 # VK_FORMAT_R32_UINT + type_description: *td2 + word_offset: { location: 0 } module: generator: 14 # Google spiregg entry_point_name: "ClosestHit0" entry_point_id: 1 + entry_point_count: 2 + entry_points: + - name: "ClosestHit0" + id: 1 + spirv_execution_model: 5316 # ClosestHitKHR + shader_stage: 0x00000400 # CLOSEST_HIT + input_variable_count: 1 + input_variables: + - *iv0 # + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 1 + binding_count: 1 + bindings: + - *db0 # "g_MaterialData" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "g_MaterialData" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 + - name: "AnyHit1" + id: 6 + spirv_execution_model: 5315 # AnyHitKHR + shader_stage: 0x00000200 # ANY_HIT + input_variable_count: 1 + input_variables: + - *iv1 # + output_variable_count: 0 + output_variables: + descriptor_set_count: 0 + descriptor_sets: + used_descriptor_binding_count: 0 + used_descriptor_bindings: + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 0 + execution_modes: [] + local_size: [0, 0, 0] + invocations: 0 + output_vertices: 0 source_language: 5 # HLSL source_language_version: 640 spirv_execution_model: 5316 # ClosestHitKHR shader_stage: 0x00000400 # CLOSEST_HIT - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "g_MaterialData" - descriptor_set_count: 1 - descriptor_sets: - - set: 1 - binding_count: 1 - bindings: - - *db0 # "g_MaterialData" - input_variable_count: 1, - input_variables: - - *iv0 # - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/variable_access/atomics_0.spv.yaml b/tests/variable_access/atomics_0.spv.yaml index f5182b7..c494753 100644 --- a/tests/variable_access/atomics_0.spv.yaml +++ b/tests/variable_access/atomics_0.spv.yaml @@ -263,30 +263,46 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td6 word_offset: { binding: 113, set: 117 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "" all_interface_variables: module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [17] + local_size: [1, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 460 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "" - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/variable_access/atomics_1.spv.yaml b/tests/variable_access/atomics_1.spv.yaml index 9033fe7..05ffc10 100644 --- a/tests/variable_access/atomics_1.spv.yaml +++ b/tests/variable_access/atomics_1.spv.yaml @@ -298,30 +298,46 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td7 word_offset: { binding: 126, set: 130 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "ssbo" all_interface_variables: module: generator: 0 # ??? entry_point_name: "main" entry_point_id: 2 + entry_point_count: 1 + entry_points: + - name: "main" + id: 2 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "ssbo" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "ssbo" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [17] + local_size: [1, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 11 # Slang source_language_version: 1 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "ssbo" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "ssbo" - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/variable_access/copy_array_0.spv.yaml b/tests/variable_access/copy_array_0.spv.yaml index 638d068..8bfbd2d 100644 --- a/tests/variable_access/copy_array_0.spv.yaml +++ b/tests/variable_access/copy_array_0.spv.yaml @@ -158,30 +158,46 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td3 word_offset: { binding: 47, set: 51 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # all_interface_variables: module: generator: 7 # Khronos SPIR-V Tools Assembler entry_point_name: "main" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "main" + id: 1 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [17] + local_size: [1, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 0 # Unknown source_language_version: 0 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/variable_access/copy_array_1.spv.yaml b/tests/variable_access/copy_array_1.spv.yaml index f8a820f..68d6b12 100644 --- a/tests/variable_access/copy_array_1.spv.yaml +++ b/tests/variable_access/copy_array_1.spv.yaml @@ -228,30 +228,46 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td5 word_offset: { binding: 118, set: 122 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "foo" all_interface_variables: module: generator: 0 # ??? entry_point_name: "main" entry_point_id: 2 + entry_point_count: 1 + entry_points: + - name: "main" + id: 2 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "foo" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "foo" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [17] + local_size: [1, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 11 # Slang source_language_version: 1 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "foo" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "foo" - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/variable_access/copy_array_2.spv.yaml b/tests/variable_access/copy_array_2.spv.yaml index 4ff64d4..1fe5ff8 100644 --- a/tests/variable_access/copy_array_2.spv.yaml +++ b/tests/variable_access/copy_array_2.spv.yaml @@ -313,32 +313,49 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td7 word_offset: { binding: 127, set: 131 } +all_descriptor_sets: + - set: 0 + binding_count: 2 + bindings: + - *db0 # "" + - *db1 # "" all_interface_variables: module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 2 + bindings: + - *db0 # "" + - *db1 # "" + used_descriptor_binding_count: 2 + used_descriptor_bindings: + - *db0 # "" + - *db1 # "" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [17] + local_size: [1, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 450 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 2 - descriptor_bindings: - - *db0 # "" - - *db1 # "" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 2 - bindings: - - *db0 # "" - - *db1 # "" - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/variable_access/copy_array_3.spv.yaml b/tests/variable_access/copy_array_3.spv.yaml index 941b89e..4e99967 100644 --- a/tests/variable_access/copy_array_3.spv.yaml +++ b/tests/variable_access/copy_array_3.spv.yaml @@ -453,35 +453,55 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td11 word_offset: { binding: 183, set: 187 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "foo1" + - set: 1 + binding_count: 1 + bindings: + - *db1 # "foo2" all_interface_variables: module: generator: 0 # ??? entry_point_name: "main" entry_point_id: 2 + entry_point_count: 1 + entry_points: + - name: "main" + id: 2 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 2 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "foo1" + - set: 1 + binding_count: 1 + bindings: + - *db1 # "foo2" + used_descriptor_binding_count: 2 + used_descriptor_bindings: + - *db0 # "foo1" + - *db1 # "foo2" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [17] + local_size: [1, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 11 # Slang source_language_version: 1 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 2 - descriptor_bindings: - - *db0 # "foo1" - - *db1 # "foo2" - descriptor_set_count: 2 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "foo1" - - set: 1 - binding_count: 1 - bindings: - - *db1 # "foo2" - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/variable_access/copy_memory.spv.yaml b/tests/variable_access/copy_memory.spv.yaml index 9e88367..b691c90 100644 --- a/tests/variable_access/copy_memory.spv.yaml +++ b/tests/variable_access/copy_memory.spv.yaml @@ -138,32 +138,49 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td1 word_offset: { binding: 40, set: 36 } +all_descriptor_sets: + - set: 0 + binding_count: 2 + bindings: + - *db0 # + - *db1 # all_interface_variables: module: generator: 7 # Khronos SPIR-V Tools Assembler entry_point_name: "main" entry_point_id: 1 + entry_point_count: 1 + entry_points: + - name: "main" + id: 1 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 2 + bindings: + - *db0 # + - *db1 # + used_descriptor_binding_count: 2 + used_descriptor_bindings: + - *db1 # + - *db0 # + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [17] + local_size: [32, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 0 # Unknown source_language_version: 0 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 2 - descriptor_bindings: - - *db0 # - - *db1 # - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 2 - bindings: - - *db0 # - - *db1 # - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/variable_access/copy_struct_0.spv.yaml b/tests/variable_access/copy_struct_0.spv.yaml index 0855b58..5f9fe6e 100644 --- a/tests/variable_access/copy_struct_0.spv.yaml +++ b/tests/variable_access/copy_struct_0.spv.yaml @@ -523,32 +523,49 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td13 word_offset: { binding: 95, set: 99 } +all_descriptor_sets: + - set: 0 + binding_count: 2 + bindings: + - *db0 # + - *db1 # all_interface_variables: module: generator: 7 # Khronos SPIR-V Tools Assembler entry_point_name: "main" entry_point_id: 2 + entry_point_count: 1 + entry_points: + - name: "main" + id: 2 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 2 + bindings: + - *db0 # + - *db1 # + used_descriptor_binding_count: 2 + used_descriptor_bindings: + - *db0 # + - *db1 # + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [17] + local_size: [1, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 0 # Unknown source_language_version: 0 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 2 - descriptor_bindings: - - *db0 # - - *db1 # - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 2 - bindings: - - *db0 # - - *db1 # - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/variable_access/copy_struct_1.spv.yaml b/tests/variable_access/copy_struct_1.spv.yaml index cbd6e96..5202882 100644 --- a/tests/variable_access/copy_struct_1.spv.yaml +++ b/tests/variable_access/copy_struct_1.spv.yaml @@ -663,35 +663,55 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td17 word_offset: { binding: 219, set: 223 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "foo1" + - set: 1 + binding_count: 1 + bindings: + - *db1 # "foo2" all_interface_variables: module: generator: 0 # ??? entry_point_name: "main" entry_point_id: 2 + entry_point_count: 1 + entry_points: + - name: "main" + id: 2 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 2 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "foo1" + - set: 1 + binding_count: 1 + bindings: + - *db1 # "foo2" + used_descriptor_binding_count: 2 + used_descriptor_bindings: + - *db0 # "foo1" + - *db1 # "foo2" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [17] + local_size: [1, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 11 # Slang source_language_version: 1 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 2 - descriptor_bindings: - - *db0 # "foo1" - - *db1 # "foo2" - descriptor_set_count: 2 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "foo1" - - set: 1 - binding_count: 1 - bindings: - - *db1 # "foo2" - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/variable_access/descriptor_indexing_0.spv.yaml b/tests/variable_access/descriptor_indexing_0.spv.yaml index aa373e9..c463c6e 100644 --- a/tests/variable_access/descriptor_indexing_0.spv.yaml +++ b/tests/variable_access/descriptor_indexing_0.spv.yaml @@ -193,30 +193,46 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td4 word_offset: { binding: 82, set: 86 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "bar" all_interface_variables: module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "bar" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "bar" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [17] + local_size: [1, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 450 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "bar" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "bar" - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/variable_access/descriptor_indexing_1.spv.yaml b/tests/variable_access/descriptor_indexing_1.spv.yaml index 1ef79f9..4aa3194 100644 --- a/tests/variable_access/descriptor_indexing_1.spv.yaml +++ b/tests/variable_access/descriptor_indexing_1.spv.yaml @@ -228,30 +228,46 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td5 word_offset: { binding: 122, set: 126 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "foo" all_interface_variables: module: generator: 0 # ??? entry_point_name: "main" entry_point_id: 2 + entry_point_count: 1 + entry_points: + - name: "main" + id: 2 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "foo" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "foo" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [17] + local_size: [1, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 11 # Slang source_language_version: 1 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "foo" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "foo" - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/variable_access/phy_storage_buffer_used_0.spv.yaml b/tests/variable_access/phy_storage_buffer_used_0.spv.yaml index 10a887f..0ae9a91 100644 --- a/tests/variable_access/phy_storage_buffer_used_0.spv.yaml +++ b/tests/variable_access/phy_storage_buffer_used_0.spv.yaml @@ -262,30 +262,46 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td5 word_offset: { binding: 144, set: 148 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "x" all_interface_variables: module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "x" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "x" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [17] + local_size: [1, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 450 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "x" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "x" - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/variable_access/phy_storage_buffer_used_1.spv.yaml b/tests/variable_access/phy_storage_buffer_used_1.spv.yaml index 79eebe6..bfaa64a 100644 --- a/tests/variable_access/phy_storage_buffer_used_1.spv.yaml +++ b/tests/variable_access/phy_storage_buffer_used_1.spv.yaml @@ -410,30 +410,46 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td7 word_offset: { binding: 165, set: 169 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "x" all_interface_variables: module: generator: 8 # Khronos Glslang Reference Front End entry_point_name: "main" entry_point_id: 4 + entry_point_count: 1 + entry_points: + - name: "main" + id: 4 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "x" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "x" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [17] + local_size: [1, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 2 # GLSL source_language_version: 450 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "x" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "x" - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/variable_access/phy_storage_buffer_used_2.spv.yaml b/tests/variable_access/phy_storage_buffer_used_2.spv.yaml index ced11a1..52ad09d 100644 --- a/tests/variable_access/phy_storage_buffer_used_2.spv.yaml +++ b/tests/variable_access/phy_storage_buffer_used_2.spv.yaml @@ -262,30 +262,46 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td5 word_offset: { binding: 120, set: 124 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "globalParams" all_interface_variables: module: generator: 0 # ??? entry_point_name: "main" entry_point_id: 2 + entry_point_count: 1 + entry_points: + - name: "main" + id: 2 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "globalParams" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "globalParams" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [17] + local_size: [1, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 11 # Slang source_language_version: 1 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "globalParams" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "globalParams" - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ... diff --git a/tests/variable_access/phy_storage_buffer_used_3.spv.yaml b/tests/variable_access/phy_storage_buffer_used_3.spv.yaml index 7d28480..b37bb1e 100644 --- a/tests/variable_access/phy_storage_buffer_used_3.spv.yaml +++ b/tests/variable_access/phy_storage_buffer_used_3.spv.yaml @@ -351,30 +351,46 @@ all_descriptor_bindings: uav_counter_binding: type_description: *td6 word_offset: { binding: 128, set: 132 } +all_descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "globalParams" all_interface_variables: module: generator: 0 # ??? entry_point_name: "main" entry_point_id: 2 + entry_point_count: 1 + entry_points: + - name: "main" + id: 2 + spirv_execution_model: 5 # GLCompute + shader_stage: 0x00000020 # CS + input_variable_count: 0 + input_variables: + output_variable_count: 0 + output_variables: + descriptor_set_count: 1 + descriptor_sets: + - set: 0 + binding_count: 1 + bindings: + - *db0 # "globalParams" + used_descriptor_binding_count: 1 + used_descriptor_bindings: + - *db0 # "globalParams" + used_push_constant_block_count: 0 + used_push_constant_blocks: + execution_mode_count: 1 + execution_modes: [17] + local_size: [1, 1, 1] + invocations: 0 + output_vertices: 0 source_language: 11 # Slang source_language_version: 1 spirv_execution_model: 5 # GLCompute shader_stage: 0x00000020 # CS - descriptor_binding_count: 1 - descriptor_bindings: - - *db0 # "globalParams" - descriptor_set_count: 1 - descriptor_sets: - - set: 0 - binding_count: 1 - bindings: - - *db0 # "globalParams" - input_variable_count: 0, - input_variables: - output_variable_count: 0, - output_variables: - push_constant_count: 0, - push_constants: specialization_constant_count: 0, specialization_constants: ...