summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarta Lofstedt <[email protected]>2016-01-21 16:17:32 +0100
committerMarta Lofstedt <[email protected]>2016-01-22 17:13:55 +0100
commit3e640c256aa1bf0d3b2e14ddc23a8d84caddcb92 (patch)
tree6a5651357f18ec8c5393f71d904eb1780e2d2248
parentae4e4ba06da0ef50150d7d366ac4f7ec2179115c (diff)
mesa: Update _mesa_has_geometry_shaders
Updates the _mesa_has_geometry_shaders function to also look for OpenGL ES 3.1 contexts that has OES_geometry_shader enabled. Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Ilia Mirkin <[email protected]> Reviewed-by: Ian Romanick <[email protected]>
-rw-r--r--src/mesa/main/context.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h
index 8b64f452572..46444d2c427 100644
--- a/src/mesa/main/context.h
+++ b/src/mesa/main/context.h
@@ -330,7 +330,8 @@ _mesa_is_gles31(const struct gl_context *ctx)
static inline bool
_mesa_has_geometry_shaders(const struct gl_context *ctx)
{
- return _mesa_is_desktop_gl(ctx) && ctx->Version >= 32;
+ return _mesa_has_OES_geometry_shader(ctx) ||
+ (_mesa_is_desktop_gl(ctx) && ctx->Version >= 32);
}