aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
authorIago Toral Quiroga <[email protected]>2019-10-14 10:13:17 +0200
committerIago Toral <[email protected]>2019-10-18 09:03:21 +0000
commit5be5b53b6d6e59acb683644cdab533fd80b00713 (patch)
tree1080b096e98273cad2bb6e682870bf12c100a113 /src/mesa/main
parentaf60187153adce3bbd47c24abcfbaf1c403f1620 (diff)
mesa/main: GL_GEOMETRY_SHADER_INVOCATIONS exists in GL_OES_geometry_shader
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 <[email protected]>
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/shaderapi.c4
1 files changed, 3 insertions, 1 deletions
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;