From: Gareth H. <ga...@so...> - 2001-03-06 04:35:59
|
CVSROOT: /cvsroot/dri Module name: xc Repository: xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/ Changes by: gareth@usw-pr-cvs1. 01/03/05 20:37:37 Log message: Merge tdfx-3-1-0 branch. Modified files: xc/xc/extras/Mesa/src/: image.c macros.h teximage.c teximage.h texstate.c texutil.c texutil.h tritemp.h types.h xc/xc/lib/GL/mesa/src/: Imakefile xc/xc/lib/GL/mesa/src/drv/i810/: i810span.c xc/xc/lib/GL/mesa/src/drv/mga/: Imakefile mgapixel.c mgatex.c xc/xc/lib/GL/mesa/src/drv/radeon/: Imakefile radeon_context.c radeon_dd.c radeon_ioctl.c radeon_state.c radeon_tex.c radeon_tex.h radeon_texobj.h xc/xc/lib/GL/mesa/src/drv/tdfx/: Imakefile tdfx_context.c tdfx_context.h tdfx_dd.c tdfx_render.c tdfx_state.c tdfx_tex.c tdfx_tex.h tdfx_texman.c tdfx_texman.h tdfx_texstate.c tdfx_wrapper.h tdfx_xmesa.c xc/xc/programs/Xserver/GL/mesa/src/: Imakefile xc/xc/programs/Xserver/hw/xfree86/drivers/ati/: radeon_reg.h radeon_sarea.h xc/xc/programs/Xserver/hw/xfree86/os-support/: xf86drmRadeon.h xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/: xf86drmRadeon.c xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/: drm.h radeon_cp.c radeon_drm.h radeon_drv.c radeon_drv.h radeon_state.c Added files: xc/xc/extras/Mesa/src/: texformat.c texformat.h texutil_tmp.h xc/xc/lib/GL/mesa/src/drv/radeon/: radeon_texmem.c radeon_texstate.c Removed files: xc/xc/lib/GL/mesa/src/drv/tdfx/: tdfx_texstate.h Revision Changes Path 1.17 +11 -12 xc/xc/extras/Mesa/src/image.c 1.7 +33 -6 xc/xc/extras/Mesa/src/macros.h 1.21 +12 -128 xc/xc/extras/Mesa/src/teximage.c 1.14 +6 -7 xc/xc/extras/Mesa/src/teximage.h 1.14 +7 -7 xc/xc/extras/Mesa/src/texstate.c 1.10 +1229 -1612xc/xc/extras/Mesa/src/texutil.c 1.5 +48 -53 xc/xc/extras/Mesa/src/texutil.h 1.16 +15 -16 xc/xc/extras/Mesa/src/tritemp.h 1.20 +17 -8 xc/xc/extras/Mesa/src/types.h 1.25 +7 -2 xc/xc/lib/GL/mesa/src/Imakefile 1.9 +3 -3 xc/xc/lib/GL/mesa/src/drv/i810/i810span.c 1.23 +2 -0 xc/xc/lib/GL/mesa/src/drv/mga/Imakefile 1.5 +3 -3 xc/xc/lib/GL/mesa/src/drv/mga/mgapixel.c 1.22 +176 -18 xc/xc/lib/GL/mesa/src/drv/mga/mgatex.c 1.7 +6 -0 xc/xc/lib/GL/mesa/src/drv/radeon/Imakefile 1.3 +0 -8 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_context.c 1.3 +6 -1 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_dd.c 1.6 +2 -6 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_ioctl.c 1.8 +8 -8 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_state.c 1.4 +506 -1844 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_tex.c 1.3 +2 -0 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_tex.h 1.3 +7 -17 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_texobj.h 1.29 +2 -0 xc/xc/lib/GL/mesa/src/drv/tdfx/Imakefile 1.4 +28 -20 xc/xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.c 1.5 +34 -46 xc/xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.h 1.3 +36 -10 xc/xc/lib/GL/mesa/src/drv/tdfx/tdfx_dd.c 1.3 +6 -9 xc/xc/lib/GL/mesa/src/drv/tdfx/tdfx_render.c 1.5 +0 -10 xc/xc/lib/GL/mesa/src/drv/tdfx/tdfx_state.c 1.4 +901 -1446 xc/xc/lib/GL/mesa/src/drv/tdfx/tdfx_tex.c 1.3 +5 -116 xc/xc/lib/GL/mesa/src/drv/tdfx/tdfx_tex.h 1.3 +790 -838 xc/xc/lib/GL/mesa/src/drv/tdfx/tdfx_texman.c 1.3 +29 -37 xc/xc/lib/GL/mesa/src/drv/tdfx/tdfx_texman.h 1.4 +209 -214 xc/xc/lib/GL/mesa/src/drv/tdfx/tdfx_texstate.c 1.3 +0 -2 xc/xc/lib/GL/mesa/src/drv/tdfx/tdfx_wrapper.h 1.23 +0 -13 xc/xc/lib/GL/mesa/src/drv/tdfx/tdfx_xmesa.c 1.15 +4 -1 xc/xc/programs/Xserver/GL/mesa/src/Imakefile 1.6 +30 -30 xc/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h 1.3 +1 -1 xc/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_sarea.h 1.5 +30 -22 xc/xc/programs/Xserver/hw/xfree86/os-support/xf86drmRadeon.h 1.5 +22 -15 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmRadeon.c 1.24 +1 -1 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm.h 1.7 +12 -38 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/radeon_cp.c 1.7 +13 -7 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/radeon_drm.h 1.6 +2 -2 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/radeon_drv.c 1.6 +20 -10 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/radeon_drv.h 1.7 +131 -105 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/radeon_state.c |