mesa: merge gallium-0.2 into gallium-master-merge
Merge commit 'origin/gallium-0.2' into gallium-master-merge Conflicts: Makefile docs/relnotes-7.4.html docs/relnotes.html src/mesa/drivers/dri/i965/brw_wm.h src/mesa/main/imports.c src/mesa/main/mtypes.h src/mesa/main/texcompress.c src/mesa/main/texenvprogram.c src/mesa/main/version.h src/mesa/vbo/vbo_exec_api.c src/mesa/vbo/vbo_save_draw.c
This commit is contained in:
@@ -416,7 +416,7 @@ _mesa_drawbuffers(GLcontext *ctx, GLuint n, const GLenum *buffers,
|
||||
}
|
||||
}
|
||||
|
||||
ctx->NewState |= _NEW_COLOR;
|
||||
ctx->NewState |= _NEW_BUFFERS;
|
||||
}
|
||||
|
||||
|
||||
@@ -491,6 +491,7 @@ _mesa_ReadBuffer(GLenum buffer)
|
||||
/* OK, all error checking has been completed now */
|
||||
|
||||
_mesa_readbuffer(ctx, buffer, srcBuffer);
|
||||
ctx->NewState |= _NEW_BUFFERS;
|
||||
|
||||
/*
|
||||
* Call device driver function.
|
||||
|
Reference in New Issue
Block a user