CVSROOT: /home/x-cvs
Module name: xc
Changes by: [EMAIL PROTECTED] 04/12/10 08:07:06
Log message:
Merge in latest DRI codebase
Modified files:
xc/config/cf/:
X11.tmpl
xc/include/GL/:
glxint.h
xc/lib/GL/:
Imakefile
xc/lib/GL/GL/:
Imakefile
xc/lib/GL/dri/drm/:
Imakefile
xc/lib/GL/glx/:
Imakefile glxclient.h glxcmds.c glxext.c glxextensions.c
glxextensions.h indirect.h indirect_init.c single2.c
xc/lib/GL/mesa/:
Imakefile
xc/lib/GL/mesa/drivers/dri/common/:
Imakefile.inc
xc/lib/GL/mesa/drivers/dri/ffb/:
Imakefile Imakefile.inc
xc/lib/GL/mesa/drivers/dri/gamma/:
Imakefile Imakefile.inc
xc/lib/GL/mesa/drivers/dri/i810/:
Imakefile Imakefile.inc
xc/lib/GL/mesa/drivers/dri/i915/:
Imakefile Imakefile.inc
xc/lib/GL/mesa/drivers/dri/mga/:
Imakefile Imakefile.inc
xc/lib/GL/mesa/drivers/dri/r128/:
Imakefile Imakefile.inc
xc/lib/GL/mesa/drivers/dri/r200/:
Imakefile Imakefile.inc
xc/lib/GL/mesa/drivers/dri/radeon/:
Imakefile Imakefile.inc
xc/lib/GL/mesa/drivers/dri/sis/:
Imakefile Imakefile.inc
xc/lib/GL/mesa/drivers/dri/tdfx/:
Imakefile Imakefile.inc
xc/lib/GL/mesa/drivers/osmesa/:
Imakefile
xc/lib/GL/mesa/main/:
Imakefile Imakefile.inc
xc/lib/GL/mesa/swrast/:
Imakefile
xc/lib/GL/mesa/tnl/:
Imakefile
xc/lib/XvMC/hw/i810/:
I810XvMC.c I810XvMC.h Imakefile
xc/programs/Xserver/GL/dri/:
Imakefile dri.c dri.h dristruct.h sarea.h xf86dri.c
xc/programs/Xserver/GL/glx/:
Imakefile g_disptab.c g_disptab.h g_render.c
g_renderswap.c g_singleswap.c glx-def.cpp glxcmds.c
glxcmdsswap.c glxcontext.h glxdrawable.h glxext.c
glxext.h glxmodule.c glxscreens.c glxscreens.h
glxserver.h glxutil.c glxutil.h render2.c render2swap.c
rensize.c single2swap.c singlesize.c unpack.h
xc/programs/Xserver/GL/mesa/:
Imakefile
xc/programs/Xserver/GL/mesa/X/:
Imakefile xf86glx.c xf86glxint.h
xc/programs/Xserver/GL/mesa/main/:
Imakefile
xc/programs/Xserver/GL/mesa/swrast/:
Imakefile
xc/programs/Xserver/GL/mesa/tnl/:
Imakefile
xc/programs/Xserver/hw/xfree86/drivers/ati/:
Imakefile r128.h r128_accel.c r128_dri.c r128_dri.h
r128_driver.c r128_reg.h r128_sarea.h radeon.h
radeon_accel.c radeon_common.h radeon_dri.c radeon_dri.h
radeon_dripriv.h radeon_driver.c radeon_sarea.h
xc/programs/Xserver/hw/xfree86/drivers/glint/:
Imakefile glint_dri.c glint_dripriv.h glint_driver.c
xc/programs/Xserver/hw/xfree86/drivers/i810/:
Imakefile i810.h i810_dri.c i810_dri.h i810_driver.c
i810_hwmc.c i830.h i830_common.h i830_dri.c i830_dri.h
xc/programs/Xserver/hw/xfree86/drivers/mga/:
Imakefile mga_dri.c mga_dri.h mga_driver.c mga_sarea.h
xc/programs/Xserver/hw/xfree86/drivers/sis/:
Imakefile sis_dri.c
xc/programs/Xserver/hw/xfree86/drivers/sunffb/:
ffb_dri.c ffb_drishare.h
xc/programs/Xserver/hw/xfree86/drivers/tdfx/:
Imakefile tdfx_dri.c tdfx_dri.h tdfx_driver.c
xc/programs/Xserver/hw/xfree86/drivers/via/:
Imakefile via_dri.c via_dri.h via_driver.c via_driver.h
xc/programs/Xserver/hw/xfree86/dummylib/:
Imakefile
xc/programs/Xserver/hw/xfree86/os-support/:
xf86drm.h
xc/programs/Xserver/hw/xfree86/os-support/linux/:
Imakefile
xc/programs/Xserver/hw/xfree86/os-support/linux/drm/:
Imakefile xf86drm.c
Added files:
xc/lib/GL/glx/:
XF86dri.c dri_glx.c dri_glx.h glx_pbuffer.c glx_query.c
glx_texture_compression.c xf86dri.h xf86dristr.h
xc/lib/GL/mesa/shader/:
Imakefile Imakefile.inc
xc/programs/Xserver/GL/mesa/shader/:
Imakefile
xc/programs/Xserver/GL/mesa/shader/module/:
Imakefile
Removed files:
xc/lib/GL/dri/:
Imakefile XF86dri.c dri_glx.c dri_glx.h dri_util.c
dri_util.h xf86dri.h xf86dristr.h
xc/lib/GL/glx/:
glcontextmodes.c glcontextmodes.h
xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/:
ati_pcigart.h create_bsd_pci_lists.sh drmP.h
drm_agpsupport.h drm_auth.h drm_bufs.h drm_context.h
drm_dma.h drm_drawable.h drm_drv.h drm_fops.h drm_ioctl.h
drm_irq.h drm_lock.h drm_memory.h drm_memory_debug.h
drm_os_freebsd.h drm_os_netbsd.h drm_pci.h drm_scatter.h
drm_sysctl.h drm_vm.h mga_drv.c r128_drv.c radeon_drv.c
sis_drv.c tdfx_drv.c
xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/:
Makefile
xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/r128/:
Makefile
xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/radeon/:
Makefile
xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/sis/:
Makefile
xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/tdfx/:
Makefile
xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/:
Config.in Doxyfile Kconfig Makefile Makefile.kernel
README.drm ati_pcigart.h create_linux_pci_lists.sh drmP.h
drm_agpsupport.h drm_auth.h drm_bufs.h drm_context.h
drm_dma.h drm_drawable.h drm_drv.h drm_fops.h drm_init.h
drm_ioctl.h drm_irq.h drm_lock.h drm_memory.h
drm_memory_debug.h drm_os_linux.h drm_pci.h drm_proc.h
drm_scatter.h drm_stub.h drm_vm.h ffb.h ffb_context.c
ffb_drv.c ffb_drv.h gamma.h gamma_context.h gamma_dma.c
gamma_drm.h gamma_drv.c gamma_drv.h gamma_lists.h
gamma_lock.h gamma_old_dma.h i810.h i810_dma.c i810_drm.h
i810_drv.c i810_drv.h i830.h i830_dma.c i830_drm.h
i830_drv.c i830_drv.h i830_irq.c i915_drv.c mga_drv.c
r128_drv.c radeon_drv.c sis_drv.c tdfx_drv.c
Revision Changes Path
1.268 +5 -1 xc/config/cf/X11.tmpl
1.7 +24 -23 xc/include/GL/glxint.h
1.46 +2 -2 xc/lib/GL/Imakefile
1.31 +1 -7 xc/lib/GL/GL/Imakefile
1.28 +8 -6 xc/lib/GL/dri/drm/Imakefile
1.30 +37 -16 xc/lib/GL/glx/Imakefile
1.25 +59 -257 xc/lib/GL/glx/glxclient.h
1.35 +283 -453 xc/lib/GL/glx/glxcmds.c
1.27 +404 -107 xc/lib/GL/glx/glxext.c
1.5 +344 -60 xc/lib/GL/glx/glxextensions.c
1.6 +156 -9 xc/lib/GL/glx/glxextensions.h
1.8 +27 -1 xc/lib/GL/glx/indirect.h
1.12 +10 -1 xc/lib/GL/glx/indirect_init.c
1.16 +110 -40 xc/lib/GL/glx/single2.c
1.3 +2 -2 xc/lib/GL/mesa/Imakefile
1.3 +30 -13 xc/lib/GL/mesa/drivers/dri/common/Imakefile.inc
1.5 +3 -5 xc/lib/GL/mesa/drivers/dri/ffb/Imakefile
1.3 +3 -2 xc/lib/GL/mesa/drivers/dri/ffb/Imakefile.inc
1.5 +3 -5 xc/lib/GL/mesa/drivers/dri/gamma/Imakefile
1.3 +3 -2 xc/lib/GL/mesa/drivers/dri/gamma/Imakefile.inc
1.5 +3 -5 xc/lib/GL/mesa/drivers/dri/i810/Imakefile
1.3 +3 -2 xc/lib/GL/mesa/drivers/dri/i810/Imakefile.inc
1.3 +3 -5 xc/lib/GL/mesa/drivers/dri/i915/Imakefile
1.2 +3 -2 xc/lib/GL/mesa/drivers/dri/i915/Imakefile.inc
1.5 +3 -5 xc/lib/GL/mesa/drivers/dri/mga/Imakefile
1.3 +2 -2 xc/lib/GL/mesa/drivers/dri/mga/Imakefile.inc
1.5 +3 -5 xc/lib/GL/mesa/drivers/dri/r128/Imakefile
1.3 +9 -15 xc/lib/GL/mesa/drivers/dri/r128/Imakefile.inc
1.5 +3 -5 xc/lib/GL/mesa/drivers/dri/r200/Imakefile
1.3 +3 -3 xc/lib/GL/mesa/drivers/dri/r200/Imakefile.inc
1.5 +3 -5 xc/lib/GL/mesa/drivers/dri/radeon/Imakefile
1.3 +3 -2 xc/lib/GL/mesa/drivers/dri/radeon/Imakefile.inc
1.5 +3 -5 xc/lib/GL/mesa/drivers/dri/sis/Imakefile
1.3 +3 -10 xc/lib/GL/mesa/drivers/dri/sis/Imakefile.inc
1.5 +3 -5 xc/lib/GL/mesa/drivers/dri/tdfx/Imakefile
1.3 +3 -2 xc/lib/GL/mesa/drivers/dri/tdfx/Imakefile.inc
1.7 +2 -1 xc/lib/GL/mesa/drivers/osmesa/Imakefile
1.2 +2 -1 xc/lib/GL/mesa/main/Imakefile
1.2 +1 -85 xc/lib/GL/mesa/main/Imakefile.inc
1.2 +2 -1 xc/lib/GL/mesa/swrast/Imakefile
1.2 +2 -1 xc/lib/GL/mesa/tnl/Imakefile
1.12 +2 -2 xc/lib/XvMC/hw/i810/I810XvMC.c
1.5 +5 -5 xc/lib/XvMC/hw/i810/I810XvMC.h
1.5 +2 -2 xc/lib/XvMC/hw/i810/Imakefile
1.11 +5 -4 xc/programs/Xserver/GL/dri/Imakefile
1.42 +33 -32 xc/programs/Xserver/GL/dri/dri.c
1.22 +13 -14 xc/programs/Xserver/GL/dri/dri.h
1.14 +8 -8 xc/programs/Xserver/GL/dri/dristruct.h
1.13 +3 -3 xc/programs/Xserver/GL/dri/sarea.h
1.14 +13 -12 xc/programs/Xserver/GL/dri/xf86dri.c
1.17 +12 -3 xc/programs/Xserver/GL/glx/Imakefile
1.7 +21 -21 xc/programs/Xserver/GL/glx/g_disptab.c
1.6 +7 -1 xc/programs/Xserver/GL/glx/g_disptab.h
1.11 +24 -17 xc/programs/Xserver/GL/glx/g_render.c
1.11 +114 -2 xc/programs/Xserver/GL/glx/g_renderswap.c
1.7 +37 -1 xc/programs/Xserver/GL/glx/g_singleswap.c
1.2 +1 -2 xc/programs/Xserver/GL/glx/glx-def.cpp
1.14 +278 -99 xc/programs/Xserver/GL/glx/glxcmds.c
1.13 +108 -85 xc/programs/Xserver/GL/glx/glxcmdsswap.c
1.6 +1 -2 xc/programs/Xserver/GL/glx/glxcontext.h
1.5 +4 -3 xc/programs/Xserver/GL/glx/glxdrawable.h
1.11 +4 -3 xc/programs/Xserver/GL/glx/glxext.c
1.9 +11 -3 xc/programs/Xserver/GL/glx/glxext.h
1.2 +3 -2 xc/programs/Xserver/GL/glx/glxmodule.c
1.16 +15 -90 xc/programs/Xserver/GL/glx/glxscreens.c
1.6 +6 -2 xc/programs/Xserver/GL/glx/glxscreens.h
1.7 +2 -1 xc/programs/Xserver/GL/glx/glxserver.h
1.7 +6 -58 xc/programs/Xserver/GL/glx/glxutil.c
1.5 +4 -2 xc/programs/Xserver/GL/glx/glxutil.h
1.10 +4 -6 xc/programs/Xserver/GL/glx/render2.c
1.9 +6 -1 xc/programs/Xserver/GL/glx/render2swap.c
1.8 +2 -2 xc/programs/Xserver/GL/glx/rensize.c
1.10 +3 -1 xc/programs/Xserver/GL/glx/single2swap.c
1.9 +51 -8 xc/programs/Xserver/GL/glx/singlesize.c
1.7 +3 -4 xc/programs/Xserver/GL/glx/unpack.h
1.9 +2 -2 xc/programs/Xserver/GL/mesa/Imakefile
1.4 +5 -2 xc/programs/Xserver/GL/mesa/X/Imakefile
1.5 +140 -97 xc/programs/Xserver/GL/mesa/X/xf86glx.c
1.2 +2 -7 xc/programs/Xserver/GL/mesa/X/xf86glxint.h
1.2 +2 -1 xc/programs/Xserver/GL/mesa/main/Imakefile
1.2 +2 -1 xc/programs/Xserver/GL/mesa/swrast/Imakefile
1.2 +2 -1 xc/programs/Xserver/GL/mesa/tnl/Imakefile
1.55 +3 -2 xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile
1.28 +10 -10 xc/programs/Xserver/hw/xfree86/drivers/ati/r128.h
1.19 +2 -1
xc/programs/Xserver/hw/xfree86/drivers/ati/r128_accel.c
1.33 +25 -22 xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c
1.8 +3 -4 xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dri.h
1.90 +3 -1
xc/programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c
1.18 +30 -67 xc/programs/Xserver/hw/xfree86/drivers/ati/r128_reg.h
1.10 +2 -2
xc/programs/Xserver/hw/xfree86/drivers/ati/r128_sarea.h
1.46 +9 -9 xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.h
1.38 +2 -1
xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_accel.c
1.10 +23 -11
xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_common.h
1.41 +40 -45
xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c
1.6 +8 -6
xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.h
1.5 +3 -3
xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dripriv.h
1.127 +2 -1
xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
1.7 +2 -2
xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_sarea.h
1.42 +2 -2
xc/programs/Xserver/hw/xfree86/drivers/glint/Imakefile
1.39 +19 -15
xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.c
1.7 +2 -2
xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dripriv.h
1.164 +2 -1
xc/programs/Xserver/hw/xfree86/drivers/glint/glint_driver.c
1.35 +2 -2 xc/programs/Xserver/hw/xfree86/drivers/i810/Imakefile
1.44 +6 -6 xc/programs/Xserver/hw/xfree86/drivers/i810/i810.h
1.44 +36 -26
xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c
1.12 +7 -6
xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.h
1.108 +3 -1
xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c
1.6 +4 -4
xc/programs/Xserver/hw/xfree86/drivers/i810/i810_hwmc.c
1.16 +3 -3 xc/programs/Xserver/hw/xfree86/drivers/i810/i830.h
1.5 +3 -3
xc/programs/Xserver/hw/xfree86/drivers/i810/i830_common.h
1.19 +23 -16
xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.c
1.9 +7 -6
xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.h
1.51 +2 -2 xc/programs/Xserver/hw/xfree86/drivers/mga/Imakefile
1.34 +15 -10 xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c
1.9 +1 -2 xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.h
1.249 +2 -1
xc/programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c
1.2 +3 -3
xc/programs/Xserver/hw/xfree86/drivers/mga/mga_sarea.h
1.35 +2 -2 xc/programs/Xserver/hw/xfree86/drivers/sis/Imakefile
1.47 +1 -3 xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dri.c
1.11 +7 -7
xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c
1.3 +7 -7
xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_drishare.h
1.26 +3 -2 xc/programs/Xserver/hw/xfree86/drivers/tdfx/Imakefile
1.27 +15 -11
xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c
1.6 +2 -2
xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.h
1.108 +2 -1
xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c
1.10 +2 -2 xc/programs/Xserver/hw/xfree86/drivers/via/Imakefile
1.10 +179 -18 xc/programs/Xserver/hw/xfree86/drivers/via/via_dri.c
1.3 +76 -8 xc/programs/Xserver/hw/xfree86/drivers/via/via_dri.h
1.36 +12 -1
xc/programs/Xserver/hw/xfree86/drivers/via/via_driver.c
1.16 +3 -1
xc/programs/Xserver/hw/xfree86/drivers/via/via_driver.h
1.5 +2 -2 xc/programs/Xserver/hw/xfree86/dummylib/Imakefile
1.29 +35 -45 xc/programs/Xserver/hw/xfree86/os-support/xf86drm.h
3.51 +3 -2
xc/programs/Xserver/hw/xfree86/os-support/linux/Imakefile
1.22 +2 -2
xc/programs/Xserver/hw/xfree86/os-support/linux/drm/Imakefile
1.38 +43 -39
xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c
_______________________________________________
Cvs-commit mailing list
[EMAIL PROTECTED]
http://XFree86.Org/mailman/listinfo/cvs-commit
