[Mesa-dev] [PATCH 1/2] mesa: querying GL_TEXTURE_COMPRESSED_IMAGE_SIZE for a buffer obj is illegal

[Kenneth Graunke]

On 08/17/2012 09:58 AM, Brian Paul wrote:
> GL_INVALID_OPERATION is to be raised when querying a non-compressed
> image/buffer.  Since a buffer object can't have a compressed format this
> query always generates an error.
> ---
>  src/mesa/main/texparam.c |   10 +++-------
>  1 files changed, 3 insertions(+), 7 deletions(-)
> 
> diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
> index 8a5abe5..5a5547d 100644
> --- a/src/mesa/main/texparam.c
> +++ b/src/mesa/main/texparam.c
> @@ -1136,13 +1136,9 @@ get_tex_level_parameter_buffer(struct gl_context *ctx,
>  
>        /* GL_ARB_texture_compression */
>        case GL_TEXTURE_COMPRESSED_IMAGE_SIZE:
> -         if (_mesa_is_format_compressed(texFormat) &&
> -             !_mesa_is_proxy_texture(target)) {
> -            *params = _mesa_format_image_size(texFormat, bo->Size, 0, 0);
> -         } else {
> -            _mesa_error(ctx, GL_INVALID_OPERATION,
> -                        "glGetTexLevelParameter[if]v(pname)");
> -         }
> +         /* Always illegal for GL_TEXTURE_BUFFER */
> +         _mesa_error(ctx, GL_INVALID_OPERATION,
> +                     "glGetTexLevelParameter[if]v(pname)");
>           break;
>  
>        /* GL_ARB_texture_float */

Oops.  Yeah, that does make sense.  Good call.

For the series:
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

Thanks as always, Brian!