summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGareth Hughes <gareth@valinux.com>2001-03-18 13:40:58 +0000
committerGareth Hughes <gareth@valinux.com>2001-03-18 13:40:58 +0000
commit264c6fd1774019d059876558eafffa1c191045a7 (patch)
treea8dae7bf8f12323e16c45146efa854801c38d352
parent3fa4bd008c900ce42bf44818fadacbc55578e1c4 (diff)
Make assertions take new GLchan formats into account.
-rw-r--r--src/mesa/main/texutil.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/main/texutil.c b/src/mesa/main/texutil.c
index dc963551ac..217f1e2d6b 100644
--- a/src/mesa/main/texutil.c
+++ b/src/mesa/main/texutil.c
@@ -1,4 +1,4 @@
-/* $Id: texutil.c,v 1.15 2001/03/18 08:53:50 gareth Exp $ */
+/* $Id: texutil.c,v 1.16 2001/03/18 13:40:58 gareth Exp $ */
/*
* Mesa 3-D graphics library
@@ -678,7 +678,7 @@ _mesa_convert_texsubimage1d( GLint mesaFormat,
ASSERT( srcImage );
ASSERT( dstImage );
- ASSERT( mesaFormat >= MESA_FORMAT_RGBA8888 );
+ ASSERT( mesaFormat >= MESA_FORMAT_RGBA );
ASSERT( mesaFormat <= MESA_FORMAT_CI8 );
/* Make it easier to pass all the parameters around.
@@ -716,7 +716,7 @@ _mesa_convert_texsubimage2d( GLint mesaFormat,
ASSERT( srcImage );
ASSERT( dstImage );
- ASSERT( mesaFormat >= MESA_FORMAT_RGBA8888 );
+ ASSERT( mesaFormat >= MESA_FORMAT_RGBA );
ASSERT( mesaFormat <= MESA_FORMAT_CI8 );
/* Make it easier to pass all the parameters around.
@@ -758,7 +758,7 @@ _mesa_convert_texsubimage3d( GLint mesaFormat,
ASSERT( srcImage );
ASSERT( dstImage );
- ASSERT( mesaFormat >= MESA_FORMAT_RGBA8888 );
+ ASSERT( mesaFormat >= MESA_FORMAT_RGBA );
ASSERT( mesaFormat <= MESA_FORMAT_CI8 );
/* Make it easier to pass all the parameters around.