From: Brian Paul <brianp@vmware.com>
Date: Fri, 25 Sep 2009 15:00:19 +0000 (-0600)
Subject: Merge branch 'mesa_7_6_branch'
X-Git-Tag: 062012170305~16161^2~152
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ecf3091cc78638919f1977ccc0307c51b6731385;p=profile%2Fivi%2Fmesa.git

Merge branch 'mesa_7_6_branch'

Conflicts:

	src/mesa/drivers/dri/intel/intel_clear.c
---

ecf3091cc78638919f1977ccc0307c51b6731385
diff --cc src/mesa/drivers/dri/intel/intel_clear.c
index fef977f,1b0e221..fb62f0f
--- a/src/mesa/drivers/dri/intel/intel_clear.c
+++ b/src/mesa/drivers/dri/intel/intel_clear.c
@@@ -172,8 -172,7 +172,7 @@@ intelClear(GLcontext *ctx, GLbitfield m
  	 DBG("\n");
        }
  
 -      _mesa_meta_clear(&intel->ctx, tri_mask);
 +      _mesa_meta_Clear(&intel->ctx, tri_mask);
-       intel_batchbuffer_flush(intel->batch);
     }
  
     if (swrast_mask) {