summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/i965/intel_pixel_copy.c
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2013-08-27 12:30:39 -0700
committerEric Anholt <eric@anholt.net>2013-08-30 11:30:44 -0700
commit6404fcb266753a2fd8243210b3553bfe846ce104 (patch)
tree4bba7e1a724004200ac9e69bd01c7ad04f9ac2c8 /src/mesa/drivers/dri/i965/intel_pixel_copy.c
parent09e2df5961cfe04925bdd820e6ea59af3ba783f6 (diff)
downloadexternal_mesa3d-6404fcb266753a2fd8243210b3553bfe846ce104.zip
external_mesa3d-6404fcb266753a2fd8243210b3553bfe846ce104.tar.gz
external_mesa3d-6404fcb266753a2fd8243210b3553bfe846ce104.tar.bz2
i965: Directly call intel_batchbuffer_flush() after i915 split.
intel_flush() now did nothing except call through (and intel_batchbuffer_flush() does the no-op check, too!) Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Paul Berry <stereotype441@gmail.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/intel_pixel_copy.c')
-rw-r--r--src/mesa/drivers/dri/i965/intel_pixel_copy.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_pixel_copy.c b/src/mesa/drivers/dri/i965/intel_pixel_copy.c
index c935c4c..9dc5c15 100644
--- a/src/mesa/drivers/dri/i965/intel_pixel_copy.c
+++ b/src/mesa/drivers/dri/i965/intel_pixel_copy.c
@@ -40,6 +40,7 @@
#include "intel_pixel.h"
#include "intel_fbo.h"
#include "intel_blit.h"
+#include "intel_batchbuffer.h"
#define FILE_DEBUG_FLAG DEBUG_PIXEL
@@ -144,7 +145,7 @@ do_blit_copypixels(struct gl_context * ctx,
intel_prepare_render(brw);
- intel_flush(&brw->ctx);
+ intel_batchbuffer_flush(brw);
/* Clip to destination buffer. */
orig_dstx = dstx;