fix YCBCR assertion and disable assertion in auto-mipmap code

This commit is contained in:
Brian Paul 2003-11-24 16:51:26 +00:00
parent 7f28ab7d24
commit c515f90ec3
1 changed files with 3 additions and 0 deletions

View File

@ -480,6 +480,7 @@ _mesa_transfer_teximage(GLcontext *ctx, GLuint dimensions,
baseInternalFormat == GL_ALPHA ||
baseInternalFormat == GL_RGB ||
baseInternalFormat == GL_RGBA ||
baseInternalFormat == GL_YCBCR_MESA ||
baseInternalFormat == GL_COLOR_INDEX ||
baseInternalFormat == GL_DEPTH_COMPONENT);
@ -1276,7 +1277,9 @@ do_row(const struct gl_texture_format *format, GLint srcWidth,
const GLuint k0 = (srcWidth == dstWidth) ? 0 : 1;
const GLuint colStride = (srcWidth == dstWidth) ? 1 : 2;
/* This assertion is no longer valid with non-power-of-2 textures
assert(srcWidth == dstWidth || srcWidth == 2 * dstWidth);
*/
switch (format->MesaFormat) {
case MESA_FORMAT_RGBA: