summaryrefslogtreecommitdiff
authorBrian Paul <brianp@vmware.com>2009-10-29 23:49:50 (GMT)
committer Brian Paul <brianp@vmware.com>2009-10-29 23:52:01 (GMT)
commitf920d496e1b5b01a3ba9bcd7dcff5c19bc109da2 (patch) (side-by-side diff)
tree79436d0bade5e043a9e3ad32cf276994a0116c5a
parentc243e8dd23e8827afe926ec6314ffdfa15b3f7ab (diff)
downloadmesa-f920d496e1b5b01a3ba9bcd7dcff5c19bc109da2.zip
mesa-f920d496e1b5b01a3ba9bcd7dcff5c19bc109da2.tar.gz
mesa: fix _mesa_texstore_argb8888() for MESA_FORMAT_XRGB8888
If we hit the general path and call _mesa_make_temp_chan_image() we always want to get a GL_RGBA texture. We were getting a 3-channel GL_RGB texture before and that messed up the memory layout.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/mesa/main/texstore.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index 14cad6b..e48d472 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -1406,7 +1406,7 @@ _mesa_texstore_argb8888(TEXSTORE_PARAMS)
{
const GLboolean littleEndian = _mesa_little_endian();
const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
- const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
+ const GLenum baseFormat = GL_RGBA;
ASSERT(dstFormat == MESA_FORMAT_ARGB8888 ||
dstFormat == MESA_FORMAT_ARGB8888_REV ||