From: Kristian Høgsberg <krh@bitplanet.net>
Date: Tue, 5 Jan 2010 15:31:11 +0000 (-0500)
Subject: Merge branch 'remove-intel-dri1'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ae44b92f61b78c9991060a8dd7fa7327d428c138;p=mesa.git

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
---

ae44b92f61b78c9991060a8dd7fa7327d428c138
diff --cc src/mesa/drivers/dri/intel/intel_tex_copy.c
index ef5aed32f31,e1d0b127527..d8e71093c47
--- a/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;
        }
     }