fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 13:28:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: error-check GL_TEXTURE_TILING_EXT params

Browse source 
This just seems like the right thing to do. We shouldn't allow
unexpected params just like that.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32349>
This commit is contained in:
Erik Faye-Lund 2024-11-26 11:47:14 +01:00 • committed by Marge Bot
parent 7b0d401265
commit 284952b864
1 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/mesa/main/texparam.c
View file

@ -248,6 +248,19 @@ _mesa_target_allows_setting_sampler_parameters(GLenum target)
}
}
static bool
is_valid_texture_tiling(struct gl_context *ctx, GLenum tiling)
{
switch (tiling) {
case GL_OPTIMAL_TILING_EXT:
case GL_LINEAR_TILING_EXT:
return true;
case GL_CONST_BW_TILING_MESA:
return _mesa_has_MESA_texture_const_bandwidth(ctx);
default:
return false;
}
}
/**
* Set an integer-valued texture parameter
@ -656,8 +669,10 @@ set_tex_parameteri(struct gl_context *ctx,
case GL_TEXTURE_TILING_EXT:
if (_mesa_has_EXT_memory_object(ctx) && !texObj->Immutable) {
texObj->TextureTiling = params[0];
if (!is_valid_texture_tiling(ctx, params[0]))
goto invalid_param;
texObj->TextureTiling = params[0];
return GL_TRUE;
}
goto invalid_pname;
@ -876,6 +891,12 @@ set_tex_parameterf(struct gl_context *ctx,
case GL_TEXTURE_TILING_EXT:
if (_mesa_has_EXT_memory_object(ctx)) {
if (!is_valid_texture_tiling(ctx, (GLenum)params[0])) {
_mesa_error(ctx, GL_INVALID_VALUE, "glTex%sParameter(param)",
suffix);
return GL_FALSE;
}
texObj->TextureTiling = params[0];
return GL_TRUE;
}