Module: Mesa Branch: texture_rg-2 Commit: 4a97014ccfdb027ec5bc594c2cd709e3ff287299 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4a97014ccfdb027ec5bc594c2cd709e3ff287299
Author: Ian Romanick <[email protected]> Date: Fri Nov 20 10:58:06 2009 -0800 ARB_texture_rg: Add missing cases for generic compress RED and RG formats --- src/mesa/drivers/dri/intel/intel_tex_format.c | 2 ++ src/mesa/main/image.c | 2 ++ src/mesa/main/texformat.c | 2 ++ src/mesa/main/teximage.c | 2 ++ 4 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/mesa/drivers/dri/intel/intel_tex_format.c b/src/mesa/drivers/dri/intel/intel_tex_format.c index de07ce6..6375fe9 100644 --- a/src/mesa/drivers/dri/intel/intel_tex_format.c +++ b/src/mesa/drivers/dri/intel/intel_tex_format.c @@ -211,10 +211,12 @@ intelChooseTextureFormat(GLcontext * ctx, GLint internalFormat, case GL_RED: case GL_R8: case GL_R16: + case GL_COMPRESSED_RED: return MESA_FORMAT_R8; case GL_RG: case GL_RG8: case GL_RG16: + case GL_COMPRESSED_RG: return MESA_FORMAT_RG88; #endif diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c index 776f60d..d841dbf 100644 --- a/src/mesa/main/image.c +++ b/src/mesa/main/image.c @@ -621,6 +621,8 @@ _mesa_is_color_format(GLenum format) case GL_COMPRESSED_LUMINANCE: case GL_COMPRESSED_LUMINANCE_ALPHA: case GL_COMPRESSED_INTENSITY: + case GL_COMPRESSED_RED: + case GL_COMPRESSED_RG: case GL_COMPRESSED_RGB: case GL_COMPRESSED_RGBA: case GL_RGB_S3TC: diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c index ed57a9f..e47f479 100644 --- a/src/mesa/main/texformat.c +++ b/src/mesa/main/texformat.c @@ -97,12 +97,14 @@ _mesa_choose_tex_format( GLcontext *ctx, GLint internalFormat, case GL_RG: case GL_RG8: case GL_RG16: + case GL_COMPRESSED_RG: return MESA_FORMAT_RG88; /* RED formats */ case GL_RED: case GL_R8: case GL_R16: + case GL_COMPRESSED_RED: return MESA_FORMAT_R8; /* Alpha formats */ diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index 9ff6171..735dc11 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -225,6 +225,7 @@ _mesa_base_tex_format( GLcontext *ctx, GLint internalFormat ) case GL_RED: case GL_R8: case GL_R16: + case GL_COMPRESSED_RED: return GL_RED; case GL_RG16F: @@ -240,6 +241,7 @@ _mesa_base_tex_format( GLcontext *ctx, GLint internalFormat ) case GL_RG: case GL_RG8: case GL_RG16: + case GL_COMPRESSED_RG: return GL_RG; default: ; /* fallthrough */ _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
