diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2002-09-21 17:11:08 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2002-09-21 17:11:08 +0000 |
| commit | 3291a3c69cb937a72480cd780a6c587dcc485f3c (patch) | |
| tree | 8dc8117a79252df15d4d95fd6dbbb5b58105ecdf | |
| parent | d2fba8a63339abd1a810df53bd90bb20b30c6cb2 (diff) | |
minor YCBCR fixes
| -rw-r--r-- | src/mesa/main/texstore.c | 4 | ||||
| -rw-r--r-- | src/mesa/main/texutil.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c index 701b8a4452..eca450a4ea 100644 --- a/src/mesa/main/texstore.c +++ b/src/mesa/main/texstore.c @@ -1,4 +1,4 @@ -/* $Id: texstore.c,v 1.34.2.7 2002/09/17 14:13:43 brianp Exp $ */ +/* $Id: texstore.c,v 1.34.2.8 2002/09/21 17:11:08 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -116,7 +116,7 @@ components_in_intformat( GLint format ) case GL_DEPTH_COMPONENT32_SGIX: return 1; case GL_YCBCR_MESA: - return 1; /* XXX YUV ok? */ + return 2; /* Y + (Cb or Cr) */ default: return -1; /* error */ } diff --git a/src/mesa/main/texutil.c b/src/mesa/main/texutil.c index 92387afdc2..7efdbe0af5 100644 --- a/src/mesa/main/texutil.c +++ b/src/mesa/main/texutil.c @@ -1,4 +1,4 @@ -/* $Id: texutil.c,v 1.25.2.7 2002/09/14 16:50:24 brianp Exp $ */ +/* $Id: texutil.c,v 1.25.2.8 2002/09/21 17:11:08 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -831,7 +831,7 @@ _mesa_convert_texsubimage1d( GLint mesaFormat, /* dest */ ASSERT( dstImage ); ASSERT( mesaFormat >= MESA_FORMAT_RGBA8888 ); - ASSERT( mesaFormat <= MESA_FORMAT_CI8 ); + ASSERT( mesaFormat <= MESA_FORMAT_YCBCR_REV ); /* Make it easier to pass all the parameters around. */ @@ -944,7 +944,7 @@ _mesa_convert_texsubimage3d( GLint mesaFormat, /* dest */ ASSERT( dstImage ); ASSERT( mesaFormat >= MESA_FORMAT_RGBA8888 ); - ASSERT( mesaFormat <= MESA_FORMAT_CI8 ); + ASSERT( mesaFormat <= MESA_FORMAT_YCBCR_REV ); /* Make it easier to pass all the parameters around. */ |