From: Kevin E. M. <ke...@us...> - 2001-03-13 18:23:39
|
CVSROOT: /cvsroot/dri Module name: xc Repository: xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/ Changes by: kem@usw-pr-cvs1. 01/03/13 10:25:39 Log message: - Merge from trunk into branch II Modified files: xc/xc/lib/GL/mesa/src/OSmesa/: Tag: sarea-1-0-0-branch Imakefile xc/xc/lib/GL/mesa/src/drv/ffb/: Tag: sarea-1-0-0-branch Imakefile xc/xc/lib/GL/mesa/src/drv/gamma/: Tag: sarea-1-0-0-branch Imakefile xc/xc/lib/GL/mesa/src/drv/i810/: Tag: sarea-1-0-0-branch Imakefile xc/xc/lib/GL/mesa/src/drv/mga/: Tag: sarea-1-0-0-branch mga_xmesa.c mga_xmesa.h mgacontext.h mgaioctl.c mgaioctl.h mgapixel.c xc/xc/lib/GL/mesa/src/drv/sis/: Tag: sarea-1-0-0-branch Imakefile xc/xc/programs/Xserver/hw/xfree86/drivers/mga/: Tag: sarea-1-0-0-branch mga_dri.c mga_dri.h mga_macros.h mga_sarea.h xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/: Tag: sarea-1-0-0-branch xf86drmHash.c xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/: Tag: sarea-1-0-0-branch mga_dma.c mga_drm.h mga_drv.h mga_state.c r128_cce.c r128_drv.c r128_drv.h r128_state.c radeon_cp.c radeon_drv.c radeon_drv.h radeon_state.c Revision Changes Path 1.8.8.1 +2 -0 xc/xc/lib/GL/mesa/src/OSmesa/Imakefile 1.4.16.1 +2 -0 xc/xc/lib/GL/mesa/src/drv/ffb/Imakefile 1.24.8.1 +3 -1 xc/xc/lib/GL/mesa/src/drv/gamma/Imakefile 1.19.8.1 +3 -1 xc/xc/lib/GL/mesa/src/drv/i810/Imakefile 1.22.2.6 +18 -2 xc/xc/lib/GL/mesa/src/drv/mga/mga_xmesa.c 1.11.2.4 +14 -1 xc/xc/lib/GL/mesa/src/drv/mga/mga_xmesa.h 1.4.2.2 +2 -2 xc/xc/lib/GL/mesa/src/drv/mga/mgacontext.h 1.16.2.2 +19 -51 xc/xc/lib/GL/mesa/src/drv/mga/mgaioctl.c 1.11.2.1 +3 -3 xc/xc/lib/GL/mesa/src/drv/mga/mgaioctl.h 1.4.2.2 +5 -6 xc/xc/lib/GL/mesa/src/drv/mga/mgapixel.c 1.9.8.1 +3 -1 xc/xc/lib/GL/mesa/src/drv/sis/Imakefile 1.28.2.8 +26 -8 xc/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c 1.6.2.5 +1 -16 xc/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.h 1.8.2.1 +0 -1 xc/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_macros.h 1.2.2.1 +1 -1 xc/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_sarea.h 1.3.50.1 +16 -16 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmHash.c 1.27.2.4 +19 -21 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_dma.c 1.7.2.1 +1 -1 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_drm.h 1.18.2.3 +8 -2 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_drv.h 1.23.2.1 +8 -13 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_state.c 1.6.2.3 +1 -18 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_cce.c 1.32.2.2 +2 -2 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_drv.c 1.18.2.2 +10 -5 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_drv.h 1.7.2.2 +0 -24 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_state.c 1.5.2.3 +2 -17 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/radeon_cp.c 1.4.2.2 +2 -2 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/radeon_drv.c 1.4.2.2 +10 -5 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/radeon_drv.h 1.6.2.2 +10 -18 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/radeon_state.c |