Mesa (staging/22.0): radv: Use correct buffer offset for conditional rendering.

[GitLab Mirror]

Module: Mesa
Branch: staging/22.0
Commit: 72a60b7e4630c31bef0f8693b54004bb15a8b0fb
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=72a60b7e4630c31bef0f8693b54004bb15a8b0fb

Author: Timur Kristóf <timur.kristof at gmail.com>
Date:   Mon Mar 28 20:07:23 2022 +0200

radv: Use correct buffer offset for conditional rendering.

Cc: mesa-stable
Signed-off-by: Timur Kristóf <timur.kristof at gmail.com>
Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15615>
(cherry picked from commit 2132d4278d413351e042153187285c50d78ef215)

Conflicts:
	src/gallium/drivers/zink/ci/zink-radv-fails.txt

---

 .pick_status.json                | 2 +-
 src/amd/vulkan/radv_cmd_buffer.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index a9b98156b36..28361f073ca 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -7468,7 +7468,7 @@
         "description": "radv: Use correct buffer offset for conditional rendering.",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 5,
+        "resolution": 1,
         "because_sha": null
     },
     {
diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index 6211a1b6238..c6ab3911ba4 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -8536,7 +8536,7 @@ radv_CmdBeginConditionalRenderingEXT(
    bool draw_visible = true;
    uint64_t va;
 
-   va = radv_buffer_get_va(buffer->bo) + pConditionalRenderingBegin->offset;
+   va = radv_buffer_get_va(buffer->bo) + buffer->offset + pConditionalRenderingBegin->offset;
 
    /* By default, if the 32-bit value at offset in buffer memory is zero,
     * then the rendering commands are discarded, otherwise they are