mesa: make more use of the existing _mesa_is_gles* helpers

Signed-off-by: Eric Engestrom <eric@igalia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21343>
This commit is contained in:
Eric Engestrom 2023-02-15 19:40:01 +00:00 committed by Marge Bot
parent a5fa548a34
commit be391402ec
2 changed files with 2 additions and 3 deletions

View file

@ -397,7 +397,7 @@ static inline bool
_mesa_has_compute_shaders(const struct gl_context *ctx)
{
return _mesa_has_ARB_compute_shader(ctx) ||
(ctx->API == API_OPENGLES2 && ctx->Version >= 31);
_mesa_is_gles31(ctx);
}
/**

View file

@ -760,8 +760,7 @@ _mesa_get_shading_language_version(const struct gl_context *ctx,
GLSL_VERSION("");
/* GLSL es */
if ((ctx->API == API_OPENGLES2 && ctx->Version >= 32) ||
ctx->Extensions.ARB_ES3_2_compatibility)
if (_mesa_is_gles32(ctx) || ctx->Extensions.ARB_ES3_2_compatibility)
GLSL_VERSION("320 es");
if (_mesa_is_gles31(ctx) || ctx->Extensions.ARB_ES3_1_compatibility)
GLSL_VERSION("310 es");