Mesa (master): Revert "amd/common: Always initialize gfx9 mipmap offset/pitch."

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: f0ed67b770619b74120444aa3788197eef28597f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f0ed67b770619b74120444aa3788197eef28597f

Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Date:   Fri Jan  3 11:19:35 2020 +0100

Revert "amd/common: Always initialize gfx9 mipmap offset/pitch."

This reverts commit 973181c06cca3fe232c3a435abde31f2fc1b81ef.

Requested by Marek.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>

---

 src/amd/common/ac_surface.c | 8 +++++---
 src/amd/common/ac_surface.h | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/amd/common/ac_surface.c b/src/amd/common/ac_surface.c
index 5e524ceb7b6..92aab57920a 100644
--- a/src/amd/common/ac_surface.c
+++ b/src/amd/common/ac_surface.c
@@ -1061,9 +1061,11 @@ static int gfx9_compute_miptree(ADDR_HANDLE addrlib,
 	surf->surf_size = out.surfSize;
 	surf->surf_alignment = out.baseAlign;
 
-	for (unsigned i = 0; i < in->numMipLevels; i++) {
-		surf->u.gfx9.offset[i] = mip_info[i].offset;
-		surf->u.gfx9.pitch[i] = mip_info[i].pitch;
+	if (in->swizzleMode == ADDR_SW_LINEAR) {
+		for (unsigned i = 0; i < in->numMipLevels; i++) {
+			surf->u.gfx9.offset[i] = mip_info[i].offset;
+			surf->u.gfx9.pitch[i] = mip_info[i].pitch;
+		}
 	}
 
 	if (in->flags.depth) {
diff --git a/src/amd/common/ac_surface.h b/src/amd/common/ac_surface.h
index dec7b206a6a..1e90c08b2e5 100644
--- a/src/amd/common/ac_surface.h
+++ b/src/amd/common/ac_surface.h
@@ -152,9 +152,9 @@ struct gfx9_surf_layout {
     uint64_t                    surf_offset; /* 0 unless imported with an offset */
     /* The size of the 2D plane containing all mipmap levels. */
     uint64_t                    surf_slice_size;
-    /* Mipmap level offset within the slice in bytes. */
+    /* Mipmap level offset within the slice in bytes. Only valid for LINEAR. */
     uint32_t                    offset[RADEON_SURF_MAX_LEVELS];
-    /* Mipmap level pitch in elements. */
+    /* Mipmap level pitch in elements. Only valid for LINEAR. */
     uint32_t                    pitch[RADEON_SURF_MAX_LEVELS];
 
     uint64_t                    stencil_offset; /* separate stencil */