turnip: Properly handle all sizes of specialization constants
authorJason Ekstrand <jason@jlekstrand.net>
Wed, 22 Apr 2020 18:43:51 +0000 (13:43 -0500)
committerMarge Bot <eric+marge@anholt.net>
Fri, 24 Apr 2020 09:23:59 +0000 (09:23 +0000)
cc: mesa-stable@lists.freedesktop.org

Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4675>

src/freedreno/vulkan/tu_shader.c

index d58209c404c5a75287b6a5a92d2811bb96669b91..3c674156afe85c22520b95579aedc11b735441c5 100644 (file)
@@ -62,10 +62,23 @@ tu_spirv_to_nir(struct ir3_compiler *compiler,
          const void *data = spec_info->pData + entry->offset;
          assert(data + entry->size <= spec_info->pData + spec_info->dataSize);
          spec[i].id = entry->constantID;
-         if (entry->size == 8)
-            spec[i].data64 = *(const uint64_t *) data;
-         else
-            spec[i].data32 = *(const uint32_t *) data;
+         switch (entry->size) {
+         case 8:
+            spec[i].data64 = *(const uint64_t *)data;
+            break;
+         case 4:
+            spec[i].data32 = *(const uint32_t *)data;
+            break;
+         case 2:
+            spec[i].data32 = *(const uint16_t *)data;
+            break;
+         case 1:
+            spec[i].data32 = *(const uint8_t *)data;
+            break;
+         default:
+            assert(!"Invalid spec constant size");
+            break;
+         }
          spec[i].defined_on_module = false;
       }