From 5be5b53b6d6e59acb683644cdab533fd80b00713 Mon Sep 17 00:00:00 2001 From: Iago Toral Quiroga Date: Mon, 14 Oct 2019 10:13:17 +0200 Subject: [PATCH] mesa/main: GL_GEOMETRY_SHADER_INVOCATIONS exists in GL_OES_geometry_shader MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit It seems that for desktop GL this was included with ARB_gpu_shader5, but for OpenGL ES this is already included with the base extension and there is a CTS test that checks this. Reviewed-by: Marek Olšák --- src/mesa/main/shaderapi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index 0a9700a6761..8bca17a9352 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -833,8 +833,10 @@ get_programiv(struct gl_context *ctx, GLuint program, GLenum pname, } return; case GL_GEOMETRY_SHADER_INVOCATIONS: - if (!has_gs || !ctx->Extensions.ARB_gpu_shader5) + if (!has_gs || + (_mesa_is_desktop_gl(ctx) && !ctx->Extensions.ARB_gpu_shader5)) { break; + } if (check_gs_query(ctx, shProg)) { *params = shProg->_LinkedShaders[MESA_SHADER_GEOMETRY]-> Program->info.gs.invocations; -- 2.30.2