summaryrefslogtreecommitdiffstats
path: root/src/amd/vulkan/radv_shader.c
diff options
context:
space:
mode:
authorJason Ekstrand <[email protected]>2020-04-22 13:42:12 -0500
committerMarge Bot <[email protected]>2020-04-24 09:23:59 +0000
commita4885df9f82130132fe361a547b9e61c96787d61 (patch)
tree58c05a842845bf0a59132666ed1eb96579f4f769 /src/amd/vulkan/radv_shader.c
parenta44e63398b045f0a5f56e4d719d25a8501ab53cd (diff)
radv: Properly handle all sizes of specialization constants
cc: [email protected] Reviewed-by: Caio Marcelo de Oliveira Filho <[email protected]> Acked-by: Bas Nieuwenhuizen <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4675>
Diffstat (limited to 'src/amd/vulkan/radv_shader.c')
-rw-r--r--src/amd/vulkan/radv_shader.c17
1 files 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 = {