Re: [Mesa3d-dev] color matrix manip bug

[Brian P. <br...@va...>]

Stephane Conversy wrote:
> 
> Keith Whitwell wrote:
> >
> > Stephane Conversy wrote:
> > >
> > > Hi.
> > >
> > > mesa 3.5, in matrix.c:78, when manipulating
> > > the color matrix, shouldn't flags be set to:
> > >
> > > flags |= _NEW_COLOR_MATRIX | _NEW_PIXEL;
> > >
> > > instead of:
> > >
> > > flags |= _NEW_COLOR_MATRIX;
> > >
> > > doing so fixes a bug when copying into a texture
> > > (ie mesa_update_state is called)...
> >
> > It sounds like the opposite is true: there is a place where we are checking
> > for _NEW_PIXEL where we should (also?) be checking for _NEW_COLOR_MATRIX.  It
> > is the color matrix that is being changed at this point, so that is the bit
> > which is set.
> 
> Ok, if I remember well, it's in _mesa_CopyTexImage2D
> at teximage.c:1874:
> 
>    if (ctx->NewState & _NEW_PIXEL)
>       _mesa_update_state(ctx);
> 
> since _NEW_PIXEL was not set, _mesa_update_state is not called
> after a color matrix change.

I think in teximage.c we should simply be checking for _IMAGE_NEW_TRANSFER_STATE
as it's defined to be (_NEW_PIXEL | _NEW_COLOR_MATRIX).

I'll fix this.  Thanks for the bug report.

-Brian