You're right. I really botched that. :( The changes in enable.c look correct, but get_hash_params.py needs the same treatment.
On 01/10/2014 11:57 AM, Ilia Mirkin wrote: > Commit c13970808 (mesa: GL_EXT_secondary_color is not optional) changed > > CHECK_EXTENSION2(EXT_secondary_color, ARB_vetex_program, cap) > > to > > CHECK_EXTENSION(ARB_vertex_program, cap) > > However CHECK_EXTENSION2 checks that either extension is available, not > both. Remove the extension check entirely since the intent was for it to > always be enabled. > > Signed-off-by: Ilia Mirkin <imir...@alum.mit.edu> > Cc: 9.2 10.0 <mesa-sta...@lists.freedesktop.org> > --- > > Someone mentioned that nouveau (dri) was getting errors with > glDisable(GL_COLOR_SUM), even though the driver should have had support for > it. > > src/mesa/main/enable.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c > index bb4a23c..fca3068 100644 > --- a/src/mesa/main/enable.c > +++ b/src/mesa/main/enable.c > @@ -762,7 +762,6 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, > GLboolean state) > case GL_COLOR_SUM_EXT: > if (ctx->API != API_OPENGL_COMPAT) > goto invalid_enum_error; > - CHECK_EXTENSION(ARB_vertex_program, cap); > if (ctx->Fog.ColorSumEnabled == state) > return; > FLUSH_VERTICES(ctx, _NEW_FOG); > @@ -1443,7 +1442,6 @@ _mesa_IsEnabled( GLenum cap ) > case GL_COLOR_SUM_EXT: > if (ctx->API != API_OPENGL_COMPAT) > goto invalid_enum_error; > - CHECK_EXTENSION(ARB_vertex_program); > return ctx->Fog.ColorSumEnabled; > > /* GL_ARB_multisample */ > _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
