From bc880b8d405e72be29c80e7e7e505f59755a388a Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 20 Apr 2011 09:31:34 -0700 Subject: [PATCH] mesa: Choose RGTC formats for GL_COMPRESSED_RED, GL_COMPRESSED_RG. We were falling through to the default R8 and RG88 formats instead of compressing when possible. Noticed by swrast fbo-blending-formats actually doing rendering. Reviewed-by: Dave Airlie Reviewed-by: Brian Paul --- src/mesa/main/texformat.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c index c85a7c0..cbebec9 100644 --- a/src/mesa/main/texformat.c +++ b/src/mesa/main/texformat.c @@ -621,7 +621,11 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat, switch (internalFormat) { case GL_R8: case GL_RED: + RETURN_IF_SUPPORTED(MESA_FORMAT_R8); + break; + case GL_COMPRESSED_RED: + RETURN_IF_SUPPORTED(MESA_FORMAT_RED_RGTC1); RETURN_IF_SUPPORTED(MESA_FORMAT_R8); break; @@ -631,7 +635,11 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat, case GL_RG: case GL_RG8: + RETURN_IF_SUPPORTED(MESA_FORMAT_RG88); + break; + case GL_COMPRESSED_RG: + RETURN_IF_SUPPORTED(MESA_FORMAT_RG_RGTC2); RETURN_IF_SUPPORTED(MESA_FORMAT_RG88); break; -- 2.7.4