Mesa (master): radv: Properly handle all sizes of specialization constants

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: a4885df9f82130132fe361a547b9e61c96787d61
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a4885df9f82130132fe361a547b9e61c96787d61

Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Wed Apr 22 13:42:12 2020 -0500

radv: Properly handle all sizes of specialization constants

cc: mesa-stable at lists.freedesktop.org

Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira at intel.com>
Acked-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4675>

---

 src/amd/vulkan/radv_shader.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c
index 61923b432ee..7d8e8a29011 100644
--- a/src/amd/vulkan/radv_shader.c
+++ b/src/amd/vulkan/radv_shader.c
@@ -327,10 +327,23 @@ radv_shader_compile_to_nir(struct radv_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;
+				}
 			}
 		}
 		const struct spirv_to_nir_options spirv_options = {