diff options
| author | Brian Paul <[email protected]> | 2003-11-24 16:51:26 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2003-11-24 16:51:26 +0000 |
| commit | c515f90ec3adca875e93b4a705e14f4a0a1661b4 (patch) | |
| tree | d87b8808266d9740500e645071839655e518d98d | |
| parent | 7f28ab7d243671b0ee17c18f3cb750f6eb3f8733 (diff) | |
fix YCBCR assertion and disable assertion in auto-mipmap code
| -rw-r--r-- | src/mesa/main/texstore.c | 3 |
1 files changed, 3 insertions, 0 deletions
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: |