summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/intel/intel_tex_image.c
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2010-05-10 17:42:43 -0400
committerKristian Høgsberg <krh@bitplanet.net>2010-05-10 17:48:11 -0400
commitc4775a27e3aaa2006b98f225387499b79bc609ef (patch)
tree48f9f35afff8c326dd5b7df9d7c51d7c22e367a0 /src/mesa/drivers/dri/intel/intel_tex_image.c
parenta86e4852f463c289eba019a4d231fbd6cae82f27 (diff)
intel: Drop intelFlush()
Now that intel_flush() deosn't use the needs_mi_flush argument, we can finally drop one of the two flush functions.
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_tex_image.c')
-rw-r--r--src/mesa/drivers/dri/intel/intel_tex_image.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c b/src/mesa/drivers/dri/intel/intel_tex_image.c
index a0e734b2ec..136fda27f6 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_image.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_image.c
@@ -239,7 +239,7 @@ try_pbo_upload(struct intel_context *intel,
dst_stride = intelImage->mt->region->pitch;
if (drm_intel_bo_references(intel->batch->buf, dst_buffer))
- intelFlush(&intel->ctx);
+ intel_flush(&intel->ctx);
intel_prepare_render(intel);
{
dri_bo *src_buffer = intel_bufferobj_buffer(intel, pbo, INTEL_READ);
@@ -480,7 +480,7 @@ intelTexImage(GLcontext * ctx,
/* Flush any queued rendering with the texture before mapping. */
if (drm_intel_bo_references(intel->batch->buf,
intelImage->mt->region->buffer)) {
- intelFlush(ctx);
+ intel_flush(ctx);
}
texImage->Data = intel_miptree_image_map(intel,
intelImage->mt,
@@ -638,7 +638,7 @@ intel_get_tex_image(GLcontext * ctx, GLenum target, GLint level,
* make sure rendering is complete.
* We could probably predicate this on texObj->_RenderToTexture
*/
- intelFlush(ctx);
+ intel_flush(ctx);
/* Map */
if (intelImage->mt) {