Merge branch 'remove-intel-dri1'

* remove-intel-dri1:
  intel: intelScreenContext() is no longer used
  intel: Remove remaining dri2.enabled tests
  intel: Drop more cliprect bookkeeping
  intel: Remove struct intel_framebuffer
  intel: Remove client-side vblank code
  intel: Drop intelWindowMoved()
  intel: Drop batchbuffer cliprect_mode tracking
  intel: Drop DRI1 static regions
  intel: Use depth buffer from ctx.DrawBuffer in copypix_src_region()
  intel: Drop LOCK/UNLOCK_HARDWARE()
  intel: Drop DRI1 SwapBuffer implementation
  intel: Drop DRI1 CopySubBuffer implementation
  intel: Drop DRI1 support
  Push __driDriverExtensions out of dri_util.c and into the drivers
  Remove leftover __DRI{screen,drawable,context}Private references
  Check for libdrm_$chipset.pc when needed

diff --cc src/glx/x11/dri_glx.c
Simple merge

diff --cc src/mesa/drivers/dri/intel/intel_tex_copy.c
index ef5aed32f31058d257ffbd64e8bcc0bf705a348d,e1d0b127527fe56bd6ddcdca633004c622a42a21..d8e71093c47b06441f79d1de3eb1e38f2ec8c0e6
--- 1/src/mesa/drivers/dri/intel/intel_tex_copy.c
--- 2/src/mesa/drivers/dri/intel/intel_tex_copy.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_copy.c
@@@ -166,11 -164,9 +164,10 @@@ do_copy_texsubimage(struct intel_contex
                             dst_bo,
                             0,
                             intelImage->mt->region->tiling,
 -                           x, y, image_x + dstx, image_y + dsty,
 +                           src->draw_x + x, src->draw_y + y,
 +                           image_x + dstx, image_y + dsty,
                             width, height,
                             GL_COPY)) {
-        UNLOCK_HARDWARE(intel);
         return GL_FALSE;
        }
     }

diff --cc src/mesa/drivers/dri/r600/r600_context.c
Simple merge

diff --cc src/mesa/drivers/dri/sis/sis_context.c
Simple merge

diff --cc src/mesa/drivers/dri/unichrome/via_state.c
Simple merge