From: Marek Olšák <maraeo@gmail.com>
Date: Sat, 3 Apr 2010 15:08:45 +0000 (+0200)
Subject: r300g: properly setup textures from X server
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e0848bd90378ba633cfa57013c650e892d931f74;p=mesa.git

r300g: properly setup textures from X server

The setup needs be done after querying tiling flags.
---

diff --git a/src/gallium/drivers/r300/r300_texture.c b/src/gallium/drivers/r300/r300_texture.c
index a9c9e14ba7c..72e14bd8922 100644
--- a/src/gallium/drivers/r300/r300_texture.c
+++ b/src/gallium/drivers/r300/r300_texture.c
@@ -901,15 +901,14 @@ static struct pipe_texture*
     tex->tex.screen = screen;
 
     tex->stride_override = stride;
-    tex->pitch[0] = stride / util_format_get_blocksize(base->format);
-
-    r300_setup_flags(tex);
-    r300_setup_texture_state(rscreen, tex);
 
     /* one ref already taken */
     tex->buffer = buffer;
 
     rws->buffer_get_tiling(rws, buffer, &tex->microtile, &tex->macrotile);
+    r300_setup_flags(tex);
+    r300_setup_miptree(rscreen, tex);
+    r300_setup_texture_state(rscreen, tex);
     return (struct pipe_texture*)tex;
 }