Module: Mesa Branch: master Commit: a19ae36ce52e72e2b93251ba0a43d683bd5e58cc URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a19ae36ce52e72e2b93251ba0a43d683bd5e58cc
Author: Jason Ekstrand <[email protected]> Date: Tue May 31 16:27:19 2016 -0700 anv/pipeline: Refactor specialization constant handling a bit Signed-off-by: Jason Ekstrand <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]> Cc: "12.0" <[email protected]> --- src/intel/vulkan/anv_pipeline.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c index 504f0be..cdbf60b 100644 --- a/src/intel/vulkan/anv_pipeline.c +++ b/src/intel/vulkan/anv_pipeline.c @@ -123,13 +123,12 @@ anv_shader_compile_to_nir(struct anv_device *device, num_spec_entries = spec_info->mapEntryCount; spec_entries = malloc(num_spec_entries * sizeof(*spec_entries)); for (uint32_t i = 0; i < num_spec_entries; i++) { - const uint32_t *data = - spec_info->pData + spec_info->pMapEntries[i].offset; - assert((const void *)(data + 1) <= - spec_info->pData + spec_info->dataSize); + VkSpecializationMapEntry entry = spec_info->pMapEntries[i]; + const void *data = spec_info->pData + entry.offset; + assert(data + entry.size <= spec_info->pData + spec_info->dataSize); spec_entries[i].id = spec_info->pMapEntries[i].constantID; - spec_entries[i].data = *data; + spec_entries[i].data = *(const uint32_t *)data; } } _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
