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

mesa/main: fix error-handling for gles1/2

Browse source 
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35097>
This commit is contained in:
Erik Faye-Lund 2023-12-12 09:44:18 +01:00 • committed by Marge Bot
parent 89d5447ea6
commit bba7f7d586
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1685,7 +1685,7 @@ _mesa_legal_get_tex_level_parameter_target(struct gl_context *ctx, GLenum target
case GL_TEXTURE_3D:
return GL_TRUE;
case GL_TEXTURE_2D_ARRAY_EXT:
return ctx->Extensions.EXT_texture_array;
return _mesa_has_EXT_texture_array(ctx) || _mesa_is_gles3(ctx);
case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:
case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:
@ -2538,13 +2538,13 @@ get_tex_parameterfv(struct gl_context *ctx,
break;
case GL_TEXTURE_SRGB_DECODE_EXT:
if (!ctx->Extensions.EXT_texture_sRGB_decode)
if (!_mesa_has_EXT_texture_sRGB_decode(ctx))
goto invalid_pname;
*params = (GLfloat) obj->Sampler.Attrib.sRGBDecode;
break;
case GL_TEXTURE_REDUCTION_MODE_EXT:
if (!ctx->Extensions.EXT_texture_filter_minmax &&
if (!_mesa_has_EXT_texture_filter_minmax(ctx) &&
!_mesa_has_ARB_texture_filter_minmax(ctx))
goto invalid_pname;
*params = (GLfloat) obj->Sampler.Attrib.ReductionMode;
@ -2831,13 +2831,13 @@ get_tex_parameteriv(struct gl_context *ctx,
break;
case GL_TEXTURE_SRGB_DECODE_EXT:
if (!ctx->Extensions.EXT_texture_sRGB_decode)
if (!_mesa_has_EXT_texture_sRGB_decode(ctx))
goto invalid_pname;
*params = obj->Sampler.Attrib.sRGBDecode;
break;
case GL_TEXTURE_REDUCTION_MODE_EXT:
if (!ctx->Extensions.EXT_texture_filter_minmax &&
if (!_mesa_has_EXT_texture_filter_minmax(ctx) &&
!_mesa_has_ARB_texture_filter_minmax(ctx))
goto invalid_pname;
*params = obj->Sampler.Attrib.ReductionMode;