diff options
author | Jason Ekstrand <[email protected]> | 2020-04-22 13:41:14 -0500 |
---|---|---|
committer | Marge Bot <[email protected]> | 2020-04-24 09:23:59 +0000 |
commit | a44e63398b045f0a5f56e4d719d25a8501ab53cd (patch) | |
tree | 44b6039466873818fddafc35f875c84f232099b8 /src/intel | |
parent | 64e4297629a1c4be501b40fb3529ff11441eff99 (diff) |
anv: Properly handle all sizes of specialization constants
Closes: #2812
cc: [email protected]
Reviewed-by: Caio Marcelo de Oliveira Filho <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4675>
Diffstat (limited to 'src/intel')
-rw-r--r-- | src/intel/vulkan/anv_pipeline.c | 17 |
1 files changed, 15 insertions, 2 deletions
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; + } } } |