Hi Carl, After a quite look the new series doesnt apply cleanly to 10.1 as there have been a number of cleanups in between. I don't think I will get around to rebasing in time for the stable release but I don't think its a big deal if this fix doesn't go in.
Tim On Tue, 2014-04-15 at 17:19 -0700, Carl Worth wrote: > Timothy Arceri <[email protected]> writes: > > Forgot to CC stable. This should apply to both 10 branches. > > Hi Timothy, > > The specific patch you were referring to didn't get applied. But a very > similar version did appear later (which I didn't find in my email > archives). See below. > > Shall I pick this over to both the 10.0 and the 10.1 branches? > > -Carl > > commit 6c3f5abc2dc99a904994fb41d6e48527ddcdf7de > Author: Timothy Arceri <[email protected]> > Date: Sat Mar 8 15:37:46 2014 +1100 > > mesa: add missing DebugMessageControl types > > Signed-off-by: Timothy Arceri <[email protected]> > Reviewed-by: Brian Paul <[email protected]> > > diff --git a/src/mesa/main/errors.c b/src/mesa/main/errors.c > index 91f62da..8ec6a8c 100644 > --- a/src/mesa/main/errors.c > +++ b/src/mesa/main/errors.c > @@ -524,6 +524,8 @@ validate_params(struct gl_context *ctx, unsigned caller, > case GL_DEBUG_TYPE_OTHER_ARB: > case GL_DEBUG_TYPE_MARKER: > break; > + case GL_DEBUG_TYPE_PUSH_GROUP: > + case GL_DEBUG_TYPE_POP_GROUP: > case GL_DONT_CARE: > if (caller == CONTROL) > break; _______________________________________________ mesa-dev mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-dev
