summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFredrik Höglund <fredrik@kde.org>2011-07-19 15:25:32 -0600
committerBrian Paul <brianp@vmware.com>2011-07-19 15:28:43 -0600
commitd84791a72b33f96fab54ff2399e8053c50205454 (patch)
tree68f9d04f8ddbcdcef8c6f334cd87af18b8575aca
parentf0e306c3430e4d8f6c8e085537807007a488f1e2 (diff)
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@kde.org> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> Signed-off-by: Brian Paul <brianp@vmware.com>
-rw-r--r--src/mesa/state_tracker/st_manager.c2
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 7bd82aae206..d5228d387f7 100644
--- a/src/mesa/state_tracker/st_manager.c
+++ b/src/mesa/state_tracker/st_manager.c
@@ -587,7 +587,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,