summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2000-09-13 22:06:36 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2000-09-13 22:06:36 +0000
commit29fb6b3525cc6f593e04a7164c5bb3e41cf8415a (patch)
tree0694e03f485fcb141c9fa19dd64c6eb8ece223aa
parent93bff74a02d29b0485935fe9175c2f4feaad0e1d (diff)
replaced GL_RGBA with GL_BGRA for GL_UNSIGNED_SHORT_1_5_5_5_REV datatype
-rw-r--r--src/mesa/main/texutil.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/mesa/main/texutil.c b/src/mesa/main/texutil.c
index 957e4711b33..6dee8f8bdb6 100644
--- a/src/mesa/main/texutil.c
+++ b/src/mesa/main/texutil.c
@@ -1,4 +1,4 @@
-/* $Id: texutil.c,v 1.5.4.1 2000/08/29 22:58:33 brianp Exp $ */
+/* $Id: texutil.c,v 1.5.4.2 2000/09/13 22:06:36 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -81,7 +81,10 @@
* GL_RGBA GL_UNSIGNED_BYTE MESA_A4_R4_G4_B4
* GL_BGRA GL_UNSIGNED_SHORT_4_4_4_4_REV MESA_A4_R4_G4_B4
* GL_BGRA GL_UNSIGHED_SHORT_1_5_5_5_REV MESA_A1_R5_G5_B5
+ * GL_RGBA GL_UNSIGNED_BYTE MESA_A1_R5_G5_B5
* GL_BGRA GL_UNSIGNED_INT_8_8_8_8_REV MESA_A8_R8_G8_B8
+ * GL_RGBA GL_UNSIGNED_BYTE MESA_A8_R8_G8_B8
+ * GL_RGB GL_UNSIGNED_BYTE MESA_A8_R8_G8_B8
* more to be added for new drivers...
*
* Notes:
@@ -500,7 +503,7 @@ _mesa_convert_teximage(MesaIntTexFormat dstFormat,
case MESA_A1_R5_G5_B5:
/* store as 16-bit texels (GR_TEXFMT_ARGB_1555) */
- if (srcFormat == GL_RGBA && srcType == GL_UNSIGNED_SHORT_1_5_5_5_REV){
+ if (srcFormat == GL_BGRA && srcType == GL_UNSIGNED_SHORT_1_5_5_5_REV){
/* special, optimized case */
if (wScale == 1 && hScale == 1) {
const GLubyte *src = _mesa_image_address(packing, srcImage,
@@ -1101,7 +1104,7 @@ _mesa_convert_texsubimage(MesaIntTexFormat dstFormat,
case MESA_A1_R5_G5_B5:
/* store as 16-bit texels (GR_TEXFMT_ARGB_1555) */
- if (srcFormat == GL_RGBA && srcType == GL_UNSIGNED_SHORT_1_5_5_5_REV){
+ if (srcFormat == GL_BGRA && srcType == GL_UNSIGNED_SHORT_1_5_5_5_REV){
/* special, optimized case */
if (wScale == 1 && hScale == 1) {
const GLubyte *src = _mesa_image_address(packing, srcImage,