Mesa (master): vc4: Decide the HW's format before laying out the miptree.

[Eric Anholt]

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

Author: Eric Anholt <eric at anholt.net>
Date:   Mon Mar 23 16:21:25 2015 -0700

vc4: Decide the HW's format before laying out the miptree.

I'm experimenting with a workaround for raster texture misrendering on
hardware, and this lets me look at the format chosen when computing
strides.

---

 src/gallium/drivers/vc4/vc4_resource.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/vc4/vc4_resource.c b/src/gallium/drivers/vc4/vc4_resource.c
index 0dda0d8..c640cf6 100644
--- a/src/gallium/drivers/vc4/vc4_resource.c
+++ b/src/gallium/drivers/vc4/vc4_resource.c
@@ -373,14 +373,14 @@ vc4_resource_create(struct pipe_screen *pscreen,
                 rsc->tiled = true;
         }
 
+        if (tmpl->target != PIPE_BUFFER)
+                rsc->vc4_format = get_resource_texture_format(prsc);
+
         vc4_setup_slices(rsc);
         vc4_resource_bo_alloc(rsc);
         if (!rsc->bo)
                 goto fail;
 
-        if (tmpl->target != PIPE_BUFFER)
-                rsc->vc4_format = get_resource_texture_format(prsc);
-
         return prsc;
 fail:
         vc4_resource_destroy(pscreen, prsc);