From 741763f32cf41a6e7d1290ce69b3fbfa8135198d Mon Sep 17 00:00:00 2001
From: Karol Herbst <kherbst@redhat.com>
Date: Wed, 5 Feb 2025 11:36:10 +0100
Subject: [PATCH] rusticl/mem: do not apply offset with in copy_image_to_buffer

The offset already gets applied when mapping the destination buffer, so we
ended up applying it twice.

Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33426>
(cherry picked from commit a2a3be3baa1cfbfb79f6ee0b91bc7180dd396b64)
---
 .pick_status.json                            | 2 +-
 src/gallium/frontends/rusticl/core/memory.rs | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 7dce363cba4..78af32e0fba 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -824,7 +824,7 @@
         "description": "rusticl/mem: do not apply offset with in copy_image_to_buffer",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/gallium/frontends/rusticl/core/memory.rs b/src/gallium/frontends/rusticl/core/memory.rs
index e8602611d19..ae60aee0e8b 100644
--- a/src/gallium/frontends/rusticl/core/memory.rs
+++ b/src/gallium/frontends/rusticl/core/memory.rs
@@ -1484,7 +1484,6 @@ impl Image {
         dst_offset: usize,
         region: &CLVec<usize>,
     ) -> CLResult<()> {
-        let dst_offset = dst.apply_offset(dst_offset)?;
         let bpp = self.image_format.pixel_size().unwrap().into();
 
         let src_pitch;