summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/texformat.h44
-rw-r--r--src/mesa/main/texutil.c8
2 files changed, 26 insertions, 26 deletions
diff --git a/src/mesa/main/texformat.h b/src/mesa/main/texformat.h
index c6b897f5445..3d15a67e7f9 100644
--- a/src/mesa/main/texformat.h
+++ b/src/mesa/main/texformat.h
@@ -1,4 +1,4 @@
-/* $Id: texformat.h,v 1.2 2001/03/18 08:53:49 gareth Exp $ */
+/* $Id: texformat.h,v 1.3 2001/03/22 06:23:56 gareth Exp $ */
/*
* Mesa 3-D graphics library
@@ -37,25 +37,6 @@
* default value, but may be changed by drivers as required.
*/
enum _format {
- /* Generic GLchan-based formats. These are the default formats used
- * by the software rasterizer and, unless the driver overrides the
- * texture image functions, incoming images will be converted to one
- * of these formats. Components are arrays of GLchan values, so
- * there will be no big/little endian issues.
- *
- * NOTE: Because these are based on the GLchan datatype, one cannot
- * assume 8 bits per channel with these formats. If you require
- * GLubyte per channel, use one of the hardware formats below.
- */
- MESA_FORMAT_RGBA,
- MESA_FORMAT_RGB,
- MESA_FORMAT_ALPHA,
- MESA_FORMAT_LUMINANCE,
- MESA_FORMAT_LUMINANCE_ALPHA,
- MESA_FORMAT_INTENSITY,
- MESA_FORMAT_COLOR_INDEX,
- MESA_FORMAT_DEPTH_COMPONENT,
-
/* Hardware-friendly formats. Drivers can override the default
* formats and convert texture images to one of these as required.
* These formats are all little endian, as shown below. They will be
@@ -68,7 +49,7 @@ enum _format {
*/
/* msb <------ TEXEL BITS -----------> lsb */
/* ---- ---- ---- ---- ---- ---- ---- ---- */
- MESA_FORMAT_RGBA8888, /* RRRR RRRR GGGG GGGG BBBB BBBB AAAA AAAA */
+ MESA_FORMAT_RGBA8888 = 0, /* RRRR RRRR GGGG GGGG BBBB BBBB AAAA AAAA */
MESA_FORMAT_ARGB8888, /* AAAA AAAA RRRR RRRR GGGG GGGG BBBB BBBB */
MESA_FORMAT_RGB888, /* RRRR RRRR GGGG GGGG BBBB BBBB */
MESA_FORMAT_RGB565, /* RRRR RGGG GGGB BBBB */
@@ -79,7 +60,26 @@ enum _format {
MESA_FORMAT_A8, /* AAAA AAAA */
MESA_FORMAT_L8, /* LLLL LLLL */
MESA_FORMAT_I8, /* IIII IIII */
- MESA_FORMAT_CI8 /* CCCC CCCC */
+ MESA_FORMAT_CI8, /* CCCC CCCC */
+
+ /* Generic GLchan-based formats. These are the default formats used
+ * by the software rasterizer and, unless the driver overrides the
+ * texture image functions, incoming images will be converted to one
+ * of these formats. Components are arrays of GLchan values, so
+ * there will be no big/little endian issues.
+ *
+ * NOTE: Because these are based on the GLchan datatype, one cannot
+ * assume 8 bits per channel with these formats. If you require
+ * GLubyte per channel, use one of the hardware formats below.
+ */
+ MESA_FORMAT_RGBA,
+ MESA_FORMAT_RGB,
+ MESA_FORMAT_ALPHA,
+ MESA_FORMAT_LUMINANCE,
+ MESA_FORMAT_LUMINANCE_ALPHA,
+ MESA_FORMAT_INTENSITY,
+ MESA_FORMAT_COLOR_INDEX,
+ MESA_FORMAT_DEPTH_COMPONENT
};
diff --git a/src/mesa/main/texutil.c b/src/mesa/main/texutil.c
index 033b17912bb..22733c88586 100644
--- a/src/mesa/main/texutil.c
+++ b/src/mesa/main/texutil.c
@@ -1,4 +1,4 @@
-/* $Id: texutil.c,v 1.17 2001/03/21 16:44:08 brianp Exp $ */
+/* $Id: texutil.c,v 1.18 2001/03/22 06:23:56 gareth Exp $ */
/*
* Mesa 3-D graphics library
@@ -679,7 +679,7 @@ _mesa_convert_texsubimage1d( GLint mesaFormat,
ASSERT( srcImage );
ASSERT( dstImage );
- ASSERT( mesaFormat >= MESA_FORMAT_RGBA );
+ ASSERT( mesaFormat >= MESA_FORMAT_RGBA8888 );
ASSERT( mesaFormat <= MESA_FORMAT_CI8 );
/* Make it easier to pass all the parameters around.
@@ -744,7 +744,7 @@ _mesa_convert_texsubimage2d( GLint mesaFormat,
ASSERT( srcImage );
ASSERT( dstImage );
- ASSERT( mesaFormat >= MESA_FORMAT_RGBA );
+ ASSERT( mesaFormat >= MESA_FORMAT_RGBA8888 );
ASSERT( mesaFormat <= MESA_FORMAT_CI8 );
/* Make it easier to pass all the parameters around.
@@ -786,7 +786,7 @@ _mesa_convert_texsubimage3d( GLint mesaFormat,
ASSERT( srcImage );
ASSERT( dstImage );
- ASSERT( mesaFormat >= MESA_FORMAT_RGBA );
+ ASSERT( mesaFormat >= MESA_FORMAT_RGBA8888 );
ASSERT( mesaFormat <= MESA_FORMAT_CI8 );
/* Make it easier to pass all the parameters around.