Mesa (20.3): freedreno/a6xx: Fix typo in height alignment calculation in a6xx layout
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Dec 1 17:45:02 UTC 2020
Module: Mesa
Branch: 20.3
Commit: 1891d300310dc3385a365967057df433117f3b7f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1891d300310dc3385a365967057df433117f3b7f
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 b10cdf3ba7a..b762dbcef96 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 7da7c0ec000..f6a0a984bce 100644
--- a/src/freedreno/fdl/fd6_layout.c
+++ b/src/freedreno/fdl/fd6_layout.c
@@ -211,7 +211,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;
More information about the mesa-commit
mailing list