← Back to branch summary

~ubuntu-branches/ubuntu/quantal/mesa/quantal

« back to all changes in this revision

Viewing changes to src/mesa/drivers/dri/i965/intel_span.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2007-02-21 12:44:07 UTC
  • mfrom: (1.2.1 upstream)
  • mto: This revision was merged to the branch mainline in revision 22.
  • Revision ID: james.westby@ubuntu.com-20070221124407-rgcacs32mycrtadl
Import upstream version 6.5.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mesa/drivers/dri/i965/intel_span.c
35
35
#include "intel_span.h"
36
36
#include "intel_ioctl.h"
37
37
#include "intel_tex.h"
 
38
#include "intel_batchbuffer.h"
38
39
#include "swrast/swrast.h"
39
40
 
40
41
#undef DBG
207
208
{
208
209
   struct intel_context *intel = intel_context(ctx);
209
210
 
 
211
   if (intel->need_flush) {
 
212
      LOCK_HARDWARE(intel);
 
213
      intel->vtbl.emit_flush(intel, 0);
 
214
      intel_batchbuffer_flush(intel->batch);
 
215
      intel->need_flush = 0;
 
216
      UNLOCK_HARDWARE(intel);
 
217
      intelFinish(&intel->ctx);
 
218
   }
 
219
 
 
220
 
210
221
   LOCK_HARDWARE(intel);
211
222
 
212
 
#if 0
213
 
   if (intel->flushBeforeFallback) {
214
 
      intelFinish(&intel->ctx);
215
 
      intel->flushBeforeFallback = GL_FALSE;
216
 
   }
217
 
#endif
218
 
 
219
223
   /* Just map the framebuffer and all textures.  Bufmgr code will
220
224
    * take care of waiting on the necessary fences:
221
225
    */