hack

KhronosGroup · Aug 27, 2018 · 0fa43bd · 0fa43bd
1 parent 0c20a8e
commit 0fa43bd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/layers/descriptor_sets.cpp b/layers/descriptor_sets.cpp
@@ -773,6 +773,8 @@ bool cvdescriptorset::DescriptorSet::ValidateDrawState(const std::map<uint32_t,
                     if (!(reqs & format_bits)) {
                         // bad component type
                         std::stringstream error_str;
+                        error_str << std::hex << reqs << " required, got " << std::hex << format_bits << " -- " << std::hex << (
+                            DESCRIPTOR_REQ_COMPONENT_TYPE_SINT | DESCRIPTOR_REQ_COMPONENT_TYPE_UINT | DESCRIPTOR_REQ_COMPONENT_TYPE_FLOAT) << " -- ";
                         error_str << "Descriptor in binding #" << binding << " at global descriptor index " << i << " requires "
                                   << StringDescriptorReqComponentType(reqs) << " component type, but bound descriptor format is "
                                   << string_VkFormat(image_view_ci.format) << ".";

diff --git a/layers/shader_validation.cpp b/layers/shader_validation.cpp
@@ -1394,7 +1394,7 @@ static uint32_t DescriptorTypeToReqs(shader_module const *module, uint32_t type_
                 auto msaa = type.word(6);
 
                 uint32_t bits = 0;
-                switch (GetFundamentalType(module, type_id)) {
+                switch (GetFundamentalType(module, type.word(2))) {
                     case FORMAT_TYPE_FLOAT:
                         bits = DESCRIPTOR_REQ_COMPONENT_TYPE_FLOAT;
                         break;