From: Eric Anholt <eric@anholt.net>
Date: Mon, 16 Mar 2015 21:48:26 +0000 (-0700)
Subject: vc4: Fix pitch alignment of linear textures.
X-Git-Tag: upstream/17.1.0~19840
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7f797e3d173c7a84aa5d231a1c173b00e84ea44f;p=platform%2Fupstream%2Fmesa.git

vc4: Fix pitch alignment of linear textures.

Fixes some non-power-of-two texture rendering when I force ARGB8888 to
raster.
---

diff --git a/src/gallium/drivers/vc4/vc4_resource.c b/src/gallium/drivers/vc4/vc4_resource.c
index b8628ec..544c032 100644
--- a/src/gallium/drivers/vc4/vc4_resource.c
+++ b/src/gallium/drivers/vc4/vc4_resource.c
@@ -258,7 +258,7 @@ vc4_setup_slices(struct vc4_resource *rsc)
 
                 if (!rsc->tiled) {
                         slice->tiling = VC4_TILING_FORMAT_LINEAR;
-                        level_width = align(level_width, 16);
+                        level_width = align(level_width, utile_w);
                 } else {
                         if (vc4_size_is_lt(level_width, level_height,
                                            rsc->cpp)) {