From eb9c708ee2f7d676c6428920adbca4d665fb4174 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Mon, 24 Apr 2017 14:16:15 +0200 Subject: [PATCH] mesa: refuse to update tex parameters when a handle is allocated MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The ARB_bindless_texture spec says: "The ARB_bindless_texture spec says: "The error INVALID_OPERATION is generated by TexImage*, CopyTexImage*, CompressedTexImage*, TexBuffer*, TexParameter*, as well as other functions defined in terms of these, if the texture object to be modified is referenced by one or more texture or image handles." Signed-off-by: Samuel Pitoiset Reviewed-by: Nicolai Hähnle --- src/mesa/main/texparam.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c index c75adc6417d..6c0a5c46d60 100644 --- a/src/mesa/main/texparam.c +++ b/src/mesa/main/texparam.c @@ -273,6 +273,19 @@ set_tex_parameteri(struct gl_context *ctx, { const char *suffix = dsa ? "ture" : ""; + if (texObj->HandleAllocated) { + /* The ARB_bindless_texture spec says: + * + * "The error INVALID_OPERATION is generated by TexImage*, CopyTexImage*, + * CompressedTexImage*, TexBuffer*, TexParameter*, as well as other + * functions defined in terms of these, if the texture object to be + * modified is referenced by one or more texture or image handles." + */ + _mesa_error(ctx, GL_INVALID_OPERATION, + "glTex%sParameter(immutable texture)", suffix); + return GL_FALSE; + } + switch (pname) { case GL_TEXTURE_MIN_FILTER: if (!_mesa_target_allows_setting_sampler_parameters(texObj->Target)) @@ -636,6 +649,19 @@ set_tex_parameterf(struct gl_context *ctx, { const char *suffix = dsa ? "ture" : ""; + if (texObj->HandleAllocated) { + /* The ARB_bindless_texture spec says: + * + * "The error INVALID_OPERATION is generated by TexImage*, CopyTexImage*, + * CompressedTexImage*, TexBuffer*, TexParameter*, as well as other + * functions defined in terms of these, if the texture object to be + * modified is referenced by one or more texture or image handles." + */ + _mesa_error(ctx, GL_INVALID_OPERATION, + "glTex%sParameter(immutable texture)", suffix); + return GL_FALSE; + } + switch (pname) { case GL_TEXTURE_MIN_LOD: if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles3(ctx)) @@ -974,6 +1000,12 @@ _mesa_texture_parameterIiv(struct gl_context *ctx, { switch (pname) { case GL_TEXTURE_BORDER_COLOR: + if (texObj->HandleAllocated) { + _mesa_error(ctx, GL_INVALID_OPERATION, + "glTextureParameterIiv(immutable texture)"); + return; + } + if (!_mesa_target_allows_setting_sampler_parameters(texObj->Target)) { _mesa_error(ctx, GL_INVALID_ENUM, "glTextureParameterIiv(texture)"); return; @@ -996,6 +1028,12 @@ _mesa_texture_parameterIuiv(struct gl_context *ctx, { switch (pname) { case GL_TEXTURE_BORDER_COLOR: + if (texObj->HandleAllocated) { + _mesa_error(ctx, GL_INVALID_OPERATION, + "glTextureParameterIuiv(immutable texture)"); + return; + } + if (!_mesa_target_allows_setting_sampler_parameters(texObj->Target)) { _mesa_error(ctx, GL_INVALID_ENUM, "glTextureParameterIuiv(texture)"); return; -- 2.30.2