From af4c897e32abda172957bc6cff217ed68b87e17a Mon Sep 17 00:00:00 2001
From: Karol Herbst <kherbst@redhat.com>
Date: Fri, 15 Apr 2022 17:58:46 +0200
Subject: [PATCH] rusticl/mem: only write pitch when required

Signed-off-by: Karol Herbst <kherbst@redhat.com>
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15439>
---
 src/gallium/frontends/rusticl/core/memory.rs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/gallium/frontends/rusticl/core/memory.rs b/src/gallium/frontends/rusticl/core/memory.rs
index 0f08a052500..82ceef65e63 100644
--- a/src/gallium/frontends/rusticl/core/memory.rs
+++ b/src/gallium/frontends/rusticl/core/memory.rs
@@ -880,8 +880,12 @@ impl Mem {
         } else {
             let tx = self.map(q, ctx, &mut lock)?;
 
-            *row_pitch = tx.row_pitch() as usize;
-            *slice_pitch = tx.slice_pitch() as usize;
+            if self.image_desc.dims() > 1 {
+                *row_pitch = tx.row_pitch() as usize;
+            }
+            if self.image_desc.dims() > 2 || self.image_desc.is_array() {
+                *slice_pitch = tx.slice_pitch() as usize;
+            }
 
             tx.ptr()
         };