Merge commit 'origin/master' into gallium-sw-api-2
authorKeith Whitwell <keithw@vmware.com>
Tue, 9 Mar 2010 11:02:37 +0000 (11:02 +0000)
committerKeith Whitwell <keithw@vmware.com>
Tue, 9 Mar 2010 11:02:37 +0000 (11:02 +0000)
commit0c96690a5b6e1c2d114e7ec5f1e9d60a4ff2a330
treeeb8aa86b722ac91c775042bd84e152c29970529c
parent95c5c69b505f562b61e23fa7dd500dbdd432a70d
parent6f4ce4a4fed9f0f0f0ee89a63e406ab86dae7150
Merge commit 'origin/master' into gallium-sw-api-2

Conflicts:
src/gallium/drivers/llvmpipe/lp_setup.c
src/gallium/drivers/softpipe/sp_texture.c
src/gallium/drivers/softpipe/sp_winsys.h
src/gallium/state_trackers/egl/common/egl_g3d.c
src/gallium/state_trackers/egl/x11/native_x11.c
src/gallium/state_trackers/egl/x11/native_x11.h
src/gallium/state_trackers/egl/x11/native_ximage.c
16 files changed:
configs/autoconf.in
configs/default
configs/linux-dri
configs/linux-egl
src/gallium/drivers/llvmpipe/lp_screen.c
src/gallium/drivers/llvmpipe/lp_setup.c
src/gallium/drivers/llvmpipe/lp_texture.c
src/gallium/drivers/llvmpipe/lp_texture.h
src/gallium/drivers/softpipe/sp_screen.c
src/gallium/drivers/softpipe/sp_texture.c
src/gallium/drivers/softpipe/sp_texture.h
src/gallium/state_trackers/egl/common/egl_g3d.c
src/gallium/state_trackers/egl/common/native.h
src/gallium/state_trackers/egl/x11/native_x11.c
src/gallium/state_trackers/egl/x11/native_x11.h
src/gallium/state_trackers/egl/x11/native_ximage.c