Mesa (7.11): st/mesa: fix the texture format in st_context_teximage
Stephane Marchesin
marcheu at kemper.freedesktop.org
Thu Jul 28 18:58:34 UTC 2011
Module: Mesa
Branch: 7.11
Commit: bba1600531d67564c156c70c88bd10460c821a99
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bba1600531d67564c156c70c88bd10460c821a99
Author: Fredrik Höglund <fredrik at kde.org>
Date: Tue Jul 19 15:25:32 2011 -0600
st/mesa: fix the texture format in st_context_teximage
Commit 1a339b6c71ebab6e1a64f05b2e133022d3bbcd15 made
st_ChooseTextureFormat map GL_RGBA with type GL_UNSIGNED_BYTE
to PIPE_FORMAT_A8B8G8R8_UNORM.
The image format for ARGB pixmaps is PIPE_FORMAT_B8G8R8A8_UNORM
however. This mismatch caused the texture to be recreated in
st_finalize_texture.
NOTE: This is a candidate for the 7.11 branch.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=39209
Signed-off-by: Fredrik Höglund <fredrik at kde.org>
Reviewed-by: Stéphane Marchesin <marcheu at chromium.org>
Signed-off-by: Brian Paul <brianp at vmware.com>
---
src/mesa/state_tracker/st_manager.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/mesa/state_tracker/st_manager.c b/src/mesa/state_tracker/st_manager.c
index c95514c..440feda 100644
--- a/src/mesa/state_tracker/st_manager.c
+++ b/src/mesa/state_tracker/st_manager.c
@@ -575,7 +575,7 @@ st_context_teximage(struct st_context_iface *stctxi,
internalFormat = GL_RGB;
texFormat = st_ChooseTextureFormat(ctx, internalFormat,
- GL_RGBA, GL_UNSIGNED_BYTE);
+ GL_BGRA, GL_UNSIGNED_BYTE);
_mesa_init_teximage_fields(ctx, target, texImage,
tex->width0, tex->height0, 1, 0,
More information about the mesa-commit
mailing list