From bd70b4f27f22fa5e06abefd2c47786c9ee34f5da Mon Sep 17 00:00:00 2001 From: "Juan A. Suarez Romero" Date: Thu, 6 Jan 2022 13:35:27 +0100 Subject: [PATCH] mesa: fix MAX_GEOMETRY_IMAGE_UNIFORMS check support MAX_GEOMETRY_IMAGE_UNIFORMS are supported if geometry shaders and either ARB_shader_image_load_store or GLES 3.1 are supported. v2: - MAX_GEOMETRY_IMAGE_UNIFORMS shouldn't be supported for GL 3.2 if ARB_shader_image_load_store is not supported (Ilia). - MAX_TESS_{CONTROL,EVALUATION}_IMAGE_UNIFORMS requires tessellation shader support (Anholt). v3: - Use _mesa_is_gles31() function (Ilia). Signed-off-by: Juan A. Suarez Romero Reviewed-by: Ilia Mirkin Reviewed-by: Emma Anholt Part-of: --- src/mesa/main/get.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index e20bc6d8f25..f1eb6502d52 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -1487,8 +1487,9 @@ check_extra(struct gl_context *ctx, const char *func, const struct value_desc *d break; case EXTRA_EXT_SHADER_IMAGE_GS: api_check = GL_TRUE; - if (ctx->Extensions.ARB_shader_image_load_store && - _mesa_has_geometry_shaders(ctx)) + if ((ctx->Extensions.ARB_shader_image_load_store || + _mesa_is_gles31(ctx)) && + _mesa_has_geometry_shaders(ctx)) api_found = GL_TRUE; break; case EXTRA_EXT_ATOMICS_TESS: