OSDN Git Service

Merge commit 'origin/gallium-winsys-handle-rebased'
authorKeith Whitwell <keithw@vmware.com>
Mon, 8 Mar 2010 12:03:46 +0000 (12:03 +0000)
committerKeith Whitwell <keithw@vmware.com>
Mon, 8 Mar 2010 12:03:46 +0000 (12:03 +0000)
commit3ca933623cf0fd3b025ab7d1b37d3fd01c854807
treee4682a56c3ff41f4d698dee76d94447a9343608e
parent9860f652e271d03672ec3e5f0e379170953a1e56
parent5024a39d111e2cef176a18e17f18917c2242ec72
Merge commit 'origin/gallium-winsys-handle-rebased'
17 files changed:
src/gallium/drivers/i965/brw_screen_texture.c
src/gallium/drivers/nv30/nv30_miptree.c
src/gallium/drivers/nv40/nv40_miptree.c
src/gallium/drivers/nv50/nv50_miptree.c
src/gallium/drivers/r300/r300_context.c
src/gallium/drivers/r300/r300_screen.c
src/gallium/drivers/r300/r300_texture.c
src/gallium/drivers/softpipe/sp_texture.c
src/gallium/drivers/svga/svga_screen_texture.c
src/gallium/state_trackers/dri/dri_drawable.c
src/gallium/state_trackers/egl/kms/native_kms.c
src/gallium/state_trackers/egl/x11/native_dri2.c
src/gallium/state_trackers/xorg/xorg_crtc.c
src/gallium/state_trackers/xorg/xorg_dri2.c
src/gallium/state_trackers/xorg/xorg_exa.c
src/gallium/state_trackers/xorg/xvmc/surface.c
src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c