diff options
| author | Chris Forbes <chrisforbes@google.com> | 2016-02-26 14:51:25 +1300 |
|---|---|---|
| committer | Chris Forbes <chrisforbes@google.com> | 2016-03-04 08:57:27 +1300 |
| commit | 109392f824be8c3c8173e8d0cb7a26f9928a4022 (patch) | |
| tree | c45c58c01d6227183ce187c68b4869fb58da0eb8 /layers/draw_state.cpp | |
| parent | bd42cfd170990e0348bc78d6a62ac20a2f4ccba1 (diff) | |
| download | usermoji-109392f824be8c3c8173e8d0cb7a26f9928a4022.tar.xz | |
layers: Remove nonsense `sinterface` param from
collect_interface_by_descriptor_slot
This was only used to produce a misleading error message.
Signed-off-by: Chris Forbes <chrisforbes@google.com>
Diffstat (limited to 'layers/draw_state.cpp')
| -rw-r--r-- | layers/draw_state.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp index eb5839b9..b67b5323 100644 --- a/layers/draw_state.cpp +++ b/layers/draw_state.cpp @@ -812,7 +812,7 @@ collect_interface_by_location(layer_data *my_data, VkDevice dev, static void collect_interface_by_descriptor_slot(layer_data *my_data, VkDevice dev, - shader_module const *src, spv::StorageClass sinterface, + shader_module const *src, std::unordered_set<uint32_t> const &accessible_ids, std::map<descriptor_slot_t, interface_var> &out) { @@ -851,7 +851,7 @@ collect_interface_by_descriptor_slot(layer_data *my_data, VkDevice dev, log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, /*dev*/0, __LINE__, SHADER_CHECKER_INCONSISTENT_SPIRV, "SC", "var %d (type %d) in %s interface in descriptor slot (%u,%u) conflicts with existing definition", - insn.word(2), insn.word(1), storage_class_name(sinterface), + insn.word(2), insn.word(1), storage_class_name(insn.word(3)), existing_it->first.first, existing_it->first.second); } @@ -1595,7 +1595,7 @@ validate_pipeline_shaders(layer_data *my_data, VkDevice dev, PIPELINE_NODE* pPip /* validate descriptor set layout against what the entrypoint actually uses */ std::map<descriptor_slot_t, interface_var> descriptor_uses; - collect_interface_by_descriptor_slot(my_data, dev, module, spv::StorageClassUniform, + collect_interface_by_descriptor_slot(my_data, dev, module, accessible_ids, descriptor_uses); |