Mesa (master): r300g: properly setup textures from X server
Marek Olšák
mareko at kemper.freedesktop.org
Sun Apr 4 00:49:39 UTC 2010
Module: Mesa
Branch: master
Commit: e0848bd90378ba633cfa57013c650e892d931f74
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e0848bd90378ba633cfa57013c650e892d931f74
Author: Marek Olšák <maraeo at gmail.com>
Date: Sat Apr 3 17:08:45 2010 +0200
r300g: properly setup textures from X server
The setup needs be done after querying tiling flags.
---
src/gallium/drivers/r300/r300_texture.c | 7 +++----
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 a9c9e14..72e14bd 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;
}
More information about the mesa-commit
mailing list