summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2010-04-03 17:08:45 +0200
committerMarek Olšák <[email protected]>2010-04-04 02:46:12 +0200
commite0848bd90378ba633cfa57013c650e892d931f74 (patch)
tree575a58cb5442758d811760a6ab8ae4d3079834f3
parent4c26cdbe01619abad413b09317f2842dcf1a4d57 (diff)
r300g: properly setup textures from X server
The setup needs be done after querying tiling flags.
-rw-r--r--src/gallium/drivers/r300/r300_texture.c7
1 files changed, 3 insertions, 4 deletions
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;
}