diff options
| author | Alan Hourihane <alanh@tungstengraphics.com> | 2008-12-15 11:22:19 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@tungstengraphics.com> | 2008-12-15 11:22:19 +0000 |
| commit | 8abc860bd46a6cd584f9a64cb4613be76f82db06 (patch) | |
| tree | 25b94d69e8ef1198cd45b2d5fc0a6fde196124de /src/mesa/state_tracker/st_cb_readpixels.c | |
| parent | a22d865f93a1db7f72e0bfe216810f67bf4c2f2c (diff) | |
| parent | 3a5d260cb1d2602b9fc32392f18538d0a6ff41c2 (diff) | |
Merge commit 'origin/gallium-0.1' into gallium-0.2
Conflicts:
src/gallium/winsys/gdi/SConscript
Diffstat (limited to 'src/mesa/state_tracker/st_cb_readpixels.c')
| -rw-r--r-- | src/mesa/state_tracker/st_cb_readpixels.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/mesa/state_tracker/st_cb_readpixels.c b/src/mesa/state_tracker/st_cb_readpixels.c index c801532788..646eaff190 100644 --- a/src/mesa/state_tracker/st_cb_readpixels.c +++ b/src/mesa/state_tracker/st_cb_readpixels.c @@ -317,10 +317,8 @@ st_readpixels(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height, if (!dest) return; - st_flush_bitmap_cache(ctx->st); - /* make sure rendering has completed */ - pipe->flush(pipe, PIPE_FLUSH_RENDER_CACHE, NULL); + st_flush(ctx->st, PIPE_FLUSH_RENDER_CACHE, NULL); if (format == GL_STENCIL_INDEX) { st_read_stencil_pixels(ctx, x, y, width, height, type, pack, dest); |