mesa: Disable GL_NV_primitive_restart extension in core contexts.
authorKenneth Graunke <kenneth@whitecape.org>
Mon, 3 Dec 2012 06:30:45 +0000 (22:30 -0800)
committerKenneth Graunke <kenneth@whitecape.org>
Tue, 4 Dec 2012 01:59:28 +0000 (17:59 -0800)
The NV formulation of primitive restart is turned on/off with
glEnableClientState/glDisableClientState.  These two functions don't
exist in core contexts, which mean that GL_NV_primitive_restart is
essentially useless...even broken.

However, leaving it on causes oglconform's primitive-restart-nv tests to
run in OpenGL 3.1 contexts, which results in them all failing.  This
patch causes 29 subtests to go from "fail" to "not run".

NOTE: This is a candidate for stable branches.

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
src/mesa/main/extensions.c

index 9e23a66d71e1d9c0f7c7ef7671b7847535f0aa7e..5fbfe2595dbcf847d79c5d6f6eedea54892e76fc 100644 (file)
@@ -308,7 +308,7 @@ static const struct extension extension_table[] = {
    { "GL_NV_light_max_exponent",                   o(dummy_true),                              GLL,            1999 },
    { "GL_NV_packed_depth_stencil",                 o(EXT_packed_depth_stencil),                GL,             2000 },
    { "GL_NV_point_sprite",                         o(NV_point_sprite),                         GL,             2001 },
-   { "GL_NV_primitive_restart",                    o(NV_primitive_restart),                    GL            2002 },
+   { "GL_NV_primitive_restart",                    o(NV_primitive_restart),                    GLL,            2002 },
    { "GL_NV_read_buffer",                          o(dummy_true),                              ES2,            2011 },
    { "GL_NV_texgen_reflection",                    o(dummy_true),                              GLL,            1999 },
    { "GL_NV_texture_barrier",                      o(NV_texture_barrier),                      GL,             2009 },