summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2007-10-17 16:18:45 -0600
committerBrian <brian.paul@tungstengraphics.com>2007-10-17 16:18:45 -0600
commit49adf51eeec31c9f3c995a70acc5008522689708 (patch)
tree9a722e6d128a8344d3334602d8eb79ffed74b8b5 /src/mesa
parent420c062cb68e4e313ef34bd879852a003101169e (diff)
Add some FLUSH_CURRENT() calls.
Without these we can find ourselves in _mesa_load_state_parameters() computing derived lighting/material values whhen the current material properties haven't been updated from the VBO. This may be a somewhat wide-spread problem that needs more attention...
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/buffers.c2
-rw-r--r--src/mesa/main/drawpix.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c
index 0e6ca8ea1c..7a918c53a7 100644
--- a/src/mesa/main/buffers.c
+++ b/src/mesa/main/buffers.c
@@ -118,6 +118,8 @@ _mesa_Clear( GLbitfield mask )
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+ FLUSH_CURRENT(ctx, 0);
+
if (MESA_VERBOSE & VERBOSE_API)
_mesa_debug(ctx, "glClear 0x%x\n", mask);
diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index 296dcf8f0b..e4be0d496e 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -276,6 +276,8 @@ _mesa_ReadPixels( GLint x, GLint y, GLsizei width, GLsizei height,
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+ FLUSH_CURRENT(ctx, 0);
+
if (width < 0 || height < 0) {
_mesa_error( ctx, GL_INVALID_VALUE,
"glReadPixels(width=%d height=%d)", width, height );