Mesa (staging/20.2): freedreno/a6xx: Fix typo in height alignment calculation in a6xx layout

[GitLab Mirror]

Module: Mesa
Branch: staging/20.2
Commit: 099633b6afc30517e351563e8b8b2e6ba3d3d99c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=099633b6afc30517e351563e8b8b2e6ba3d3d99c

Author: Danylo Piliaiev <dpiliaiev at igalia.com>
Date:   Thu Nov 26 14:05:59 2020 +0200

freedreno/a6xx: Fix typo in height alignment calculation in a6xx layout

Fixes KHR-GL31.texture_size_promotion.functional

Fixes: e49748521ec9182e8d2eec823182cc463709123f
Signed-off-by: Danylo Piliaiev <dpiliaiev at igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7792>
(cherry picked from commit a569ffeb83daaa3f3c179e0d315a5079334835f8)

---

 .pick_status.json              | 2 +-
 src/freedreno/fdl/fd6_layout.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 6afc7a19bb4..b51aa8ba6e7 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1885,7 +1885,7 @@
         "description": "freedreno/a6xx: Fix typo in height alignment calculation in a6xx layout",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "e49748521ec9182e8d2eec823182cc463709123f"
     },
diff --git a/src/freedreno/fdl/fd6_layout.c b/src/freedreno/fdl/fd6_layout.c
index 096af1672a2..ac4afdeec80 100644
--- a/src/freedreno/fdl/fd6_layout.c
+++ b/src/freedreno/fdl/fd6_layout.c
@@ -208,7 +208,7 @@ fdl6_layout(struct fdl_layout *layout,
 		 * may not be. note this only matters if last level is linear
 		 */
 		if (level == mip_levels - 1)
-			height = align(nblocksy, 4);
+			nblocksy = align(nblocksy, 4);
 
 		slice->offset = offset + layout->size;