Module: Mesa Branch: master Commit: 2b99e15d0a6440edc0a616b031376a025247ece4 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2b99e15d0a6440edc0a616b031376a025247ece4
Author: Samuel Pitoiset <[email protected]> Date: Mon Sep 21 13:43:49 2020 +0200 radv: fix transform feedback crashes if pCounterBufferOffsets is NULL >From the Vulkan 1.2.154 spec: "If pCounterBufferOffsets is NULL, then it is assumed the offsets are zero." Fix new CTS dEQP-VK.transform_feedback.simple.backward_dependency_no_offset_array. CC: mesa-stable Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Bas Nieuwenhuizen <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6798> --- src/amd/vulkan/radv_cmd_buffer.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index e8d6b740c54..6f0a6a04275 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -6642,8 +6642,12 @@ radv_emit_streamout_begin(struct radv_cmd_buffer *cmd_buffer, /* The array of counter buffers is optional. */ RADV_FROM_HANDLE(radv_buffer, buffer, pCounterBuffers[counter_buffer_idx]); uint64_t va = radv_buffer_get_va(buffer->bo); + uint64_t counter_buffer_offset = 0; - va += buffer->offset + pCounterBufferOffsets[counter_buffer_idx]; + if (pCounterBufferOffsets) + counter_buffer_offset = pCounterBufferOffsets[counter_buffer_idx]; + + va += buffer->offset + counter_buffer_offset; /* Append */ radeon_emit(cs, PKT3(PKT3_STRMOUT_BUFFER_UPDATE, 4, 0)); @@ -6706,9 +6710,13 @@ gfx10_emit_streamout_begin(struct radv_cmd_buffer *cmd_buffer, if (append) { RADV_FROM_HANDLE(radv_buffer, buffer, pCounterBuffers[counter_buffer_idx]); + uint64_t counter_buffer_offset = 0; + + if (pCounterBufferOffsets) + counter_buffer_offset = pCounterBufferOffsets[counter_buffer_idx]; va += radv_buffer_get_va(buffer->bo); - va += buffer->offset + pCounterBufferOffsets[counter_buffer_idx]; + va += buffer->offset + counter_buffer_offset; radv_cs_add_buffer(cmd_buffer->device->ws, cs, buffer->bo); } @@ -6771,8 +6779,12 @@ radv_emit_streamout_end(struct radv_cmd_buffer *cmd_buffer, /* The array of counters buffer is optional. */ RADV_FROM_HANDLE(radv_buffer, buffer, pCounterBuffers[counter_buffer_idx]); uint64_t va = radv_buffer_get_va(buffer->bo); + uint64_t counter_buffer_offset = 0; - va += buffer->offset + pCounterBufferOffsets[counter_buffer_idx]; + if (pCounterBufferOffsets) + counter_buffer_offset = pCounterBufferOffsets[counter_buffer_idx]; + + va += buffer->offset + counter_buffer_offset; radeon_emit(cs, PKT3(PKT3_STRMOUT_BUFFER_UPDATE, 4, 0)); radeon_emit(cs, STRMOUT_SELECT_BUFFER(i) | @@ -6823,8 +6835,12 @@ gfx10_emit_streamout_end(struct radv_cmd_buffer *cmd_buffer, /* The array of counters buffer is optional. */ RADV_FROM_HANDLE(radv_buffer, buffer, pCounterBuffers[counter_buffer_idx]); uint64_t va = radv_buffer_get_va(buffer->bo); + uint64_t counter_buffer_offset = 0; + + if (pCounterBufferOffsets) + counter_buffer_offset = pCounterBufferOffsets[counter_buffer_idx]; - va += buffer->offset + pCounterBufferOffsets[counter_buffer_idx]; + va += buffer->offset + counter_buffer_offset; si_cs_emit_write_event_eop(cs, cmd_buffer->device->physical_device->rad_info.chip_class, _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
