From 178c1bf1adef9e3871b1ec35da839fc04fe481cf Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Wed, 18 Dec 2013 14:43:19 -0800 Subject: mesa: Generate GL_INVALID_OPERATION for unsupported DSA TexStorage functions We have to make the functions available to work around a GLEW bug (see comments already in the code), but if an application calls one of these functions we should still generate GL_INVALID_OPERATION. Signed-off-by: Ian Romanick Reviewed-by: Brian Paul --- src/mesa/main/texstorage.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/mesa/main/texstorage.c b/src/mesa/main/texstorage.c index 97bb43cfda4..22208572f51 100644 --- a/src/mesa/main/texstorage.c +++ b/src/mesa/main/texstorage.c @@ -464,12 +464,16 @@ _mesa_TextureStorage1DEXT(GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width) { + GET_CURRENT_CONTEXT(ctx); + (void) texture; (void) target; (void) levels; (void) internalformat; (void) width; - /* no-op */ + + _mesa_error(ctx, GL_INVALID_OPERATION, + "glTextureStorage1DEXT not supported"); } @@ -478,13 +482,17 @@ _mesa_TextureStorage2DEXT(GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height) { + GET_CURRENT_CONTEXT(ctx); + (void) texture; (void) target; (void) levels; (void) internalformat; (void) width; (void) height; - /* no-op */ + + _mesa_error(ctx, GL_INVALID_OPERATION, + "glTextureStorage2DEXT not supported"); } @@ -494,6 +502,8 @@ _mesa_TextureStorage3DEXT(GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth) { + GET_CURRENT_CONTEXT(ctx); + (void) texture; (void) target; (void) levels; @@ -501,5 +511,7 @@ _mesa_TextureStorage3DEXT(GLuint texture, GLenum target, GLsizei levels, (void) width; (void) height; (void) depth; - /* no-op */ + + _mesa_error(ctx, GL_INVALID_OPERATION, + "glTextureStorage3DEXT not supported"); } -- cgit v1.2.3