From: Jason Ekstrand <jason@jlekstrand.net>
Date: Wed, 22 Apr 2020 18:41:14 +0000 (-0500)
Subject: anv: Properly handle all sizes of specialization constants
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a44e63398b045f0a5f56e4d719d25a8501ab53cd;p=mesa.git

anv: Properly handle all sizes of specialization constants

Closes: #2812
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>
---

diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c
index 3eee3b74d84..ea232944666 100644
--- a/src/intel/vulkan/anv_pipeline.c
+++ b/src/intel/vulkan/anv_pipeline.c
@@ -147,10 +147,23 @@ anv_shader_compile_to_nir(struct anv_device *device,
          assert(data + entry.size <= spec_info->pData + spec_info->dataSize);
 
          spec_entries[i].id = spec_info->pMapEntries[i].constantID;
-         if (spec_info->dataSize == 8)
+         switch (entry.size) {
+         case 8:
             spec_entries[i].data64 = *(const uint64_t *)data;
-         else
+            break;
+         case 4:
             spec_entries[i].data32 = *(const uint32_t *)data;
+            break;
+         case 2:
+            spec_entries[i].data32 = *(const uint16_t *)data;
+            break;
+         case 1:
+            spec_entries[i].data32 = *(const uint8_t *)data;
+            break;
+         default:
+            assert(!"Invalid spec constant size");
+            break;
+         }
       }
    }