diff options
| author | Brian Paul <brianp@vmware.com> | 2010-12-13 17:01:30 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-12-13 17:02:48 -0700 |
| commit | bb7c2691d25b6aaea2663f85a5b6723edbf56938 (patch) | |
| tree | 41f8abe9f098582f26229e3d8686aa3cb5d2f60d /src/mesa | |
| parent | 2d577ee730c30caacf711babde6542766aa0b655 (diff) | |
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.
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/extensions.c | 3 | ||||
| -rw-r--r-- | 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 b71afdd61f..05e04504c7 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 930b60ade2..51a45a7d51 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)) { |