Mesa (7.10): mesa, st/mesa: disable GL_ARB_geometry_shader4

[Brian Paul]

Module: Mesa
Branch: 7.10
Commit: 7db3e66ba8b8befd1944501edcea785dde30e435
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7db3e66ba8b8befd1944501edcea785dde30e435

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Dec 14 16:30:01 2010 -0700

mesa, st/mesa: disable GL_ARB_geometry_shader4

The new GLSL compiler doesn't support geom shaders yet so disable the
GL_ARB_geometry_shader4 extension.  Undo this when geom shaders work again.

NOTE: This is a candidate for the 7.10 branch.

(cherry picked from commit bb7c2691d25b6aaea2663f85a5b6723edbf56938)

---

 src/mesa/main/extensions.c             |    3 ++-
 src/mesa/state_tracker/st_extensions.c |    2 ++
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index b71afdd..05e0450 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -249,7 +249,8 @@ _mesa_enable_sw_extensions(struct gl_context *ctx)
 #if FEATURE_ARB_framebuffer_object
    ctx->Extensions.ARB_framebuffer_object = GL_TRUE;
 #endif
-#if FEATURE_ARB_geometry_shader4
+#if FEATURE_ARB_geometry_shader4 && 0
+   /* XXX re-enable when GLSL compiler again supports geometry shaders */
    ctx->Extensions.ARB_geometry_shader4 = GL_TRUE;
 #endif
    ctx->Extensions.ARB_half_float_pixel = GL_TRUE;
diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index 930b60a..51a45a7 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -442,7 +442,9 @@ void st_init_extensions(struct st_context *st)
 #endif
 
    if (screen->get_shader_param(screen, PIPE_SHADER_GEOMETRY, PIPE_SHADER_CAP_MAX_INSTRUCTIONS) > 0) {
+#if 0 /* XXX re-enable when GLSL compiler again supports geometry shaders */
       ctx->Extensions.ARB_geometry_shader4 = GL_TRUE;
+#endif
    }
 
    if (screen->get_param(screen, PIPE_CAP_PRIMITIVE_RESTART)) {