diff options
| author | Brian Paul <brianp@vmware.com> | 2009-09-20 10:36:45 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-09-20 10:36:45 -0600 |
| commit | ebf2710b2fd21ae9a6604c015ca7a948589f5a8c (patch) | |
| tree | dd6b9da40b44824a1a4bdcfb4b3b2fc7edef3233 /src/mesa/drivers/dri/intel | |
| parent | ed4076b5b8c5d3c024e291f42a8730b4f71226c9 (diff) | |
| parent | 82c2f7756af19f0a19aeda7ea1f627262e4561c0 (diff) | |
Merge branch 'mesa_7_6_branch'
Conflicts:
src/mesa/drivers/dri/intel/intel_clear.c
Diffstat (limited to 'src/mesa/drivers/dri/intel')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_clear.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_clear.c b/src/mesa/drivers/dri/intel/intel_clear.c index 4ce783f450..9010b910c7 100644 --- a/src/mesa/drivers/dri/intel/intel_clear.c +++ b/src/mesa/drivers/dri/intel/intel_clear.c @@ -38,6 +38,7 @@ #include "intel_fbo.h" #include "intel_pixel.h" #include "intel_regions.h" +#include "intel_batchbuffer.h" #define FILE_DEBUG_FLAG DEBUG_BLIT @@ -170,8 +171,9 @@ intelClear(GLcontext *ctx, GLbitfield mask) } DBG("\n"); } - intelFlush(&intel->ctx); - _mesa_meta_Clear(&intel->ctx, tri_mask); + + _mesa_meta_clear(&intel->ctx, tri_mask); + intel_batchbuffer_flush(intel->batch); } if (swrast_mask) { |