Merge branch 'gallium-drm-driver-drescriptor'
authorJakob Bornecrantz <jakob@vmware.com>
Mon, 28 Jun 2010 18:59:09 +0000 (20:59 +0200)
committerJakob Bornecrantz <jakob@vmware.com>
Mon, 28 Jun 2010 19:14:45 +0000 (21:14 +0200)
commita01e0afd9fc0d647081c6903baa1a7ba505c4b05
tree7e04eb2b4e87137455920f6131b064dc87056e14
parent250b92f3bb4fc4a53f3150b0e8ff1e121a5adbc7
parent9ca563a9a8573bf79821abc75ccf0fdade19c8a9
Merge branch 'gallium-drm-driver-drescriptor'

Conflicts:
src/gallium/state_trackers/egl/x11/native_dri2.c
src/gallium/state_trackers/egl/x11/native_x11.c
src/gallium/state_trackers/egl/x11/native_x11.h
src/gallium/state_trackers/xorg/xorg_driver.c
src/gallium/winsys/radeon/drm/radeon_drm.c
18 files changed:
configure.ac
src/gallium/drivers/galahad/Makefile
src/gallium/drivers/galahad/SConscript
src/gallium/drivers/i915/i915_screen.c
src/gallium/drivers/r300/r300_screen.c
src/gallium/drivers/r300/r300_texture.c
src/gallium/drivers/r300/r300_winsys.h
src/gallium/state_trackers/egl/kms/native_kms.c
src/gallium/state_trackers/egl/x11/native_dri2.c
src/gallium/state_trackers/egl/x11/native_x11.c
src/gallium/state_trackers/egl/x11/native_x11.h
src/gallium/state_trackers/xorg/xorg_driver.c
src/gallium/state_trackers/xorg/xorg_tracker.h
src/gallium/targets/dri-radeong/Makefile
src/gallium/targets/egl-radeon/Makefile
src/gallium/targets/xorg-radeon/Makefile
src/gallium/winsys/r600/drm/r600_drm.c
src/gallium/winsys/radeon/drm/radeon_r300.c