dri/nouveau: Don't assert(0) on compressed internal formats.

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_texture.c b/src/mesa/drivers/dri/nouveau/nouveau_texture.c
index cd063702af0a20a3332fd6e9c358ac5c14e56b62..9254a9e7bec2d56c0d0d2b6d9bb0bb5007c11fcc 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_texture.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_texture.c
@@ -115,6 +115,7 @@ nouveau_choose_tex_format(struct gl_context *ctx, GLint internalFormat,
        case GL_RGBA12:
        case GL_RGBA16:
        case GL_RGB10_A2:
+       case GL_COMPRESSED_RGBA:
                return MESA_FORMAT_ARGB8888;
        case GL_RGB5_A1:
                return MESA_FORMAT_ARGB1555;
@@ -124,6 +125,7 @@ nouveau_choose_tex_format(struct gl_context *ctx, GLint internalFormat,
        case GL_RGB10:
        case GL_RGB12:
        case GL_RGB16:
+       case GL_COMPRESSED_RGB:
                return MESA_FORMAT_XRGB8888;
        case 3:
        case GL_R3_G3_B2:
@@ -139,6 +141,7 @@ nouveau_choose_tex_format(struct gl_context *ctx, GLint internalFormat,
        case GL_LUMINANCE12_ALPHA12:
        case GL_LUMINANCE16_ALPHA16:
        case GL_LUMINANCE8_ALPHA8:
+       case GL_COMPRESSED_LUMINANCE_ALPHA:
                return MESA_FORMAT_ARGB8888;
 
        case 1:
@@ -147,6 +150,7 @@ nouveau_choose_tex_format(struct gl_context *ctx, GLint internalFormat,
        case GL_LUMINANCE12:
        case GL_LUMINANCE16:
        case GL_LUMINANCE8:
+       case GL_COMPRESSED_LUMINANCE:
                return MESA_FORMAT_L8;
 
        case GL_ALPHA:
@@ -154,6 +158,7 @@ nouveau_choose_tex_format(struct gl_context *ctx, GLint internalFormat,
        case GL_ALPHA12:
        case GL_ALPHA16:
        case GL_ALPHA8:
+       case GL_COMPRESSED_ALPHA:
                return MESA_FORMAT_A8;
 
        case GL_INTENSITY: