From a6af24ee14a3e3cef99e96db539aa2abc911e6e0 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 17 Aug 2012 10:50:39 -0600 Subject: [PATCH] mesa: querying GL_TEXTURE_COMPRESSED_IMAGE_SIZE for a buffer obj is illegal 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. Reviewed-by: Ian Romanick Reviewed-by: Kenneth Graunke --- src/mesa/main/texparam.c | 10 +++------- 1 file 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 */ -- 2.7.4