radv: fix writing buffer markers with non-zero memory offset
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>
Tue, 24 May 2022 21:29:15 +0000 (23:29 +0200)
committerMarge Bot <emma+marge@anholt.net>
Thu, 26 May 2022 08:23:52 +0000 (08:23 +0000)
Found by insepction.

Cc: mesa-stable
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16698>

src/amd/vulkan/radv_cmd_buffer.c

index 172d0e6..f4c1700 100644 (file)
@@ -9310,7 +9310,7 @@ radv_CmdWriteBufferMarker2AMD(VkCommandBuffer commandBuffer, VkPipelineStageFlag
    RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer);
    RADV_FROM_HANDLE(radv_buffer, buffer, dstBuffer);
    struct radeon_cmdbuf *cs = cmd_buffer->cs;
-   uint64_t va = radv_buffer_get_va(buffer->bo) + dstOffset;
+   uint64_t va = radv_buffer_get_va(buffer->bo) + buffer->offset + dstOffset;
 
    si_emit_cache_flush(cmd_buffer);