summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-10-29 17:49:50 -0600
committerBrian Paul <brianp@vmware.com>2009-10-29 17:52:01 -0600
commitf920d496e1b5b01a3ba9bcd7dcff5c19bc109da2 (patch)
tree79436d0bade5e043a9e3ad32cf276994a0116c5a
parentc243e8dd23e8827afe926ec6314ffdfa15b3f7ab (diff)
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.
-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 14cad6b32fe..e48d4720611 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -1406,7 +1406,7 @@ _mesa_texstore_argb8888(TEXSTORE_PARAMS)
1406{ 1406{
1407 const GLboolean littleEndian = _mesa_little_endian(); 1407 const GLboolean littleEndian = _mesa_little_endian();
1408 const GLuint texelBytes = _mesa_get_format_bytes(dstFormat); 1408 const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
1409 const GLenum baseFormat = _mesa_get_format_base_format(dstFormat); 1409 const GLenum baseFormat = GL_RGBA;
1410 1410
1411 ASSERT(dstFormat == MESA_FORMAT_ARGB8888 || 1411 ASSERT(dstFormat == MESA_FORMAT_ARGB8888 ||
1412 dstFormat == MESA_FORMAT_ARGB8888_REV || 1412 dstFormat == MESA_FORMAT_ARGB8888_REV ||