From: Marta Lofstedt <marta.lofstedt@intel.com>
Date: Thu, 21 Jan 2016 15:17:32 +0000 (+0100)
Subject: mesa: Update _mesa_has_geometry_shaders
X-Git-Tag: upstream/17.1.0~13057
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3e640c256aa1bf0d3b2e14ddc23a8d84caddcb92;p=platform%2Fupstream%2Fmesa.git

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 <mattst88@gmail.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
---

diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h
index 8b64f45..46444d2 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);
 }