> Can someone explain why the "<<<<<" business is in the
> source file?
That should not be. It looks to me like a broken file.
Either patching or CVS transfer might have failed.
-Alex.
> static void r200SetBuffer( GLcontext *ctx,
> GLframebuffer *colorBuffer,
> GLuint bufferBit )
> {
> r200ContextPtr rmesa = R200_CONTEXT(ctx);
>
> <<<<<<< r200_span.c
>
> switch ( mode ) {
> case GL_FRONT_LEFT:
> =======
> switch ( bufferBit ) {
> case FRONT_LEFT_BIT:
> >>>>>>> 1.2
> if ( rmesa->doPageFlip && rmesa->sarea->pfCurrentPage == 1 ) {
> rmesa->state.pixel.readOffset = rmesa->r200Screen->backOffset;
> rmesa->state.pixel.readPitch = rmesa->r200Screen->backPitch;
> rmesa->state.color.drawOffset = rmesa->r200Screen->backOffset;
_______________________________________________
Devel mailing list
[EMAIL PROTECTED]
http://XFree86.Org/mailman/listinfo/devel
