From 214fd4e40db24b95b609a7e2ad2dd58ce3ffb7a9 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Mon, 26 May 2025 13:30:18 +0200 Subject: [PATCH] mesa/main: fix texture view enum checks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These were a bit of a mixed bag; we had some open-coded cases, and a few overly permissive code-paths. Anyway, let's stricten this up a bit. Reviewed-by: Marek Olšák Part-of: --- src/mesa/main/texparam.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c index 113544c5116..a67e1cf2ed3 100644 --- a/src/mesa/main/texparam.c +++ b/src/mesa/main/texparam.c @@ -2500,7 +2500,7 @@ get_tex_parameterfv(struct gl_context *ctx, break; case GL_TEXTURE_IMMUTABLE_LEVELS: - if (_mesa_is_gles3(ctx) || _mesa_has_texture_view(ctx)) + if (_mesa_has_texture_view(ctx)) *params = (GLfloat) obj->Attrib.ImmutableLevels; else goto invalid_pname; @@ -2793,32 +2793,32 @@ get_tex_parameteriv(struct gl_context *ctx, break; case GL_TEXTURE_IMMUTABLE_LEVELS: - if (_mesa_has_ARB_texture_view(ctx) || _mesa_is_gles3(ctx)) + if (_mesa_has_texture_view(ctx)) *params = obj->Attrib.ImmutableLevels; else goto invalid_pname; break; case GL_TEXTURE_VIEW_MIN_LEVEL: - if (!ctx->Extensions.ARB_texture_view) + if (!_mesa_has_texture_view(ctx)) goto invalid_pname; *params = (GLint) obj->Attrib.MinLevel; break; case GL_TEXTURE_VIEW_NUM_LEVELS: - if (!ctx->Extensions.ARB_texture_view) + if (!_mesa_has_texture_view(ctx)) goto invalid_pname; *params = (GLint) obj->Attrib.NumLevels; break; case GL_TEXTURE_VIEW_MIN_LAYER: - if (!ctx->Extensions.ARB_texture_view) + if (!_mesa_has_texture_view(ctx)) goto invalid_pname; *params = (GLint) obj->Attrib.MinLayer; break; case GL_TEXTURE_VIEW_NUM_LAYERS: - if (!ctx->Extensions.ARB_texture_view) + if (!_mesa_has_texture_view(ctx)) goto invalid_pname; *params = (GLint) obj->Attrib.NumLayers; break;