From c515f90ec3adca875e93b4a705e14f4a0a1661b4 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Mon, 24 Nov 2003 16:51:26 +0000 Subject: [PATCH] fix YCBCR assertion and disable assertion in auto-mipmap code --- src/mesa/main/texstore.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c index f4b864cfb3e..36d5c25ce4b 100644 --- a/src/mesa/main/texstore.c +++ b/src/mesa/main/texstore.c @@ -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: -- 2.11.0