Merge branch 'mesa_7_5_branch'

Conflicts:

	src/mesa/main/state.c

diff --cc progs/xdemos/glxswapcontrol.c
Simple merge

diff --cc src/mesa/drivers/dri/intel/intel_batchbuffer.c
index e94b8368cde799e601ba4e7715296729bdc98ac0,82a92a9f454bd5c548681194d2050f0fe78b243e..6aa36d10b1203c34c74fce7d439de8ec2ed07cfb
--- 1/src/mesa/drivers/dri/intel/intel_batchbuffer.c
--- 2/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;

diff --cc src/mesa/main/image.c
Simple merge

diff --cc src/mesa/state_tracker/st_extensions.c
Simple merge