[Mesa-dev] [PATCH v2 5/6] mesa: Update _mesa_has_geometry_shaders

Marta Lofstedt marta.lofstedt at linux.intel.com
Fri Nov 27 06:31:09 PST 2015


From: Marta Lofstedt <marta.lofstedt at intel.com>

Updates the _mesa_has_geometry_shaders function to also look
for OpenGL ES 3.1 contexts that has OES_geometry_shader enabled.
---
 src/mesa/main/context.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h
index 8b64f45..23b2718 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_is_gles31(ctx) && ctx->Extensions.OES_geometry_shader) ||
+		   (_mesa_is_desktop_gl(ctx) && ctx->Version >= 32);
 }
 
 
-- 
2.5.0



More information about the mesa-dev mailing list