summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Hellstrom <thellstrom-at-vmware-dot-com>2009-04-20 20:43:56 +0200
committerThomas Hellstrom <thellstrom-at-vmware-dot-com>2009-04-22 11:42:46 +0200
commitf057f6543da469f231d551cb5728d98df8add4fa (patch)
treed16838b4f2507d6e699a84aea2d6da7fbcd72db4
parent009749b4a8c3ec54f47f3f85552e5ae275ab6ae6 (diff)
gallium: Reinstate unconditional flushes.
Lost in commit e50dd26ca6d0eb0d0f97c2780020ea16e3d4a687. Signed-off-by: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
-rw-r--r--src/mesa/state_tracker/st_cb_drawpixels.c2
-rw-r--r--src/mesa/state_tracker/st_cb_readpixels.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index 703b465574d..08dc7c930e2 100644
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -906,6 +906,8 @@ st_CopyPixels(GLcontext *ctx, GLint srcx, GLint srcy,
GLfloat *color;
enum pipe_format srcFormat, texFormat;
+ pipe->flush(pipe, PIPE_FLUSH_RENDER_CACHE, NULL);
+
st_validate_state(st);
if (type == GL_STENCIL) {
diff --git a/src/mesa/state_tracker/st_cb_readpixels.c b/src/mesa/state_tracker/st_cb_readpixels.c
index 85adcb785ee..7a4bbf5ce3a 100644
--- a/src/mesa/state_tracker/st_cb_readpixels.c
+++ b/src/mesa/state_tracker/st_cb_readpixels.c
@@ -357,6 +357,8 @@ st_readpixels(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height,
if (!dest)
return;
+ st_flush(ctx->st, PIPE_FLUSH_RENDER_CACHE, NULL);
+
if (format == GL_STENCIL_INDEX ||
format == GL_DEPTH_STENCIL) {
st_read_stencil_pixels(ctx, x, y, width, height,