st/mesa: fix the texture format in st_context_teximage
authorFredrik Höglund <fredrik@kde.org>
Tue, 19 Jul 2011 21:25:32 +0000 (15:25 -0600)
committerBrian Paul <brianp@vmware.com>
Tue, 19 Jul 2011 21:28:43 +0000 (15:28 -0600)
commitd84791a72b33f96fab54ff2399e8053c50205454
tree68f9d04f8ddbcdcef8c6f334cd87af18b8575aca
parentf0e306c3430e4d8f6c8e085537807007a488f1e2
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>
src/mesa/state_tracker/st_manager.c