From: Brian Paul <brianp@vmware.com>
Date: Wed, 5 Aug 2009 20:13:48 +0000 (-0600)
Subject: Merge branch 'mesa_7_5_branch'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1f713059934c2365a42aadfdca49213b36a7de90;p=mesa.git

Merge branch 'mesa_7_5_branch'

Conflicts:

	src/mesa/main/state.c
---

1f713059934c2365a42aadfdca49213b36a7de90
diff --cc src/mesa/drivers/dri/intel/intel_batchbuffer.c
index e94b8368cde,82a92a9f454..6aa36d10b12
--- a/src/mesa/drivers/dri/intel/intel_batchbuffer.c
+++ b/src/mesa/drivers/dri/intel/intel_batchbuffer.c
@@@ -195,12 -195,13 +195,17 @@@ _intel_batchbuffer_flush(struct intel_b
  {
     struct intel_context *intel = batch->intel;
     GLuint used = batch->ptr - batch->map;
 -   GLboolean was_locked = intel->locked;
 +
 +   if (intel->first_post_swapbuffers_batch == NULL) {
 +      intel->first_post_swapbuffers_batch = intel->batch->buf;
 +      drm_intel_bo_reference(intel->first_post_swapbuffers_batch);
 +   }
  
+    if (intel->first_post_swapbuffers_batch == NULL) {
+       intel->first_post_swapbuffers_batch = intel->batch->buf;
+       drm_intel_bo_reference(intel->first_post_swapbuffers_batch);
+    }
+ 
     if (used == 0) {
        batch->cliprect_mode = IGNORE_CLIPRECTS;
        return;