OSDN Git Service

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)
committerStéphane Marchesin <marcheu@chromium.org>
Thu, 28 Jul 2011 18:56:45 +0000 (11:56 -0700)
commitbba1600531d67564c156c70c88bd10460c821a99
tree1929a9b2a873914a8f9747580715d9c07b1ade80
parentf4c55ea0164ef0dc25cf90a0a832b83454bc4006
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