[Mesa-dev] [PATCH 1/3] meta: Don't enable TEXTURE_RECTANGLE when it's unsupported.

[Ian Romanick]

On 10/04/2011 01:55 PM, Kenneth Graunke wrote:
> In particular, it's not supported on OpenGL ES 1.x.

I'd change this text slightly.  It's just the current convention that 
drivers that support NV_texture_rectangle (and some other extensions) 
don't enable them in ES 1.x.  In the future, I'd like to eliminate that 
convention.  Drivers should just enable everything that they support, 
and the API should filter out the stuff that can't be exposed in a 
particular context.

> Prior to this, none of the OpenGL ES 1.1 conformance tests passed.
>
> Signed-off-by: Kenneth Graunke<kenneth at whitecape.org>
> ---
>   src/mesa/drivers/common/meta.c |    3 ++-
>   1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
> index 4d645e2..5b73dcd 100644
> --- a/src/mesa/drivers/common/meta.c
> +++ b/src/mesa/drivers/common/meta.c
> @@ -496,7 +496,8 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state)
>               _mesa_set_enable(ctx, GL_TEXTURE_3D, GL_FALSE);
>               if (ctx->Extensions.ARB_texture_cube_map)
>                  _mesa_set_enable(ctx, GL_TEXTURE_CUBE_MAP, GL_FALSE);
> -            _mesa_set_enable(ctx, GL_TEXTURE_RECTANGLE, GL_FALSE);
> +            if (ctx->Extensions.NV_texture_rectangle)
> +               _mesa_set_enable(ctx, GL_TEXTURE_RECTANGLE, GL_FALSE);
>               _mesa_set_enable(ctx, GL_TEXTURE_GEN_S, GL_FALSE);
>               _mesa_set_enable(ctx, GL_TEXTURE_GEN_T, GL_FALSE);
>               _mesa_set_enable(ctx, GL_TEXTURE_GEN_R, GL_FALSE);