summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/i965/intel_buffer_objects.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_buffer_objects.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_buffer_objects.c')
-rw-r--r--src/mesa/drivers/dri/i965/intel_buffer_objects.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_buffer_objects.c b/src/mesa/drivers/dri/i965/intel_buffer_objects.c
index 663cc29..21d3727 100644
--- a/src/mesa/drivers/dri/i965/intel_buffer_objects.c
+++ b/src/mesa/drivers/dri/i965/intel_buffer_objects.c
@@ -291,7 +291,7 @@ intel_bufferobj_map_range(struct gl_context * ctx,
} else {
perf_debug("Stalling on the GPU for mapping a busy buffer "
"object\n");
- intel_flush(ctx);
+ intel_batchbuffer_flush(brw);
}
} else if (drm_intel_bo_busy(intel_obj->buffer) &&
(access & GL_MAP_INVALIDATE_BUFFER_BIT)) {