From: Brian P. <br...@us...> - 2002-11-22 21:47:27
|
CVSROOT: /cvsroot/dri Module name: xc Repository: xc/xc/programs/Xserver/hw/xfree86/drivers/vmware/ Changes by: brianp@sc8-pr-cvs1. 02/11/22 13:47:26 Log message: merge from trunk Modified files: xc/xc/config/cf/: Tag: mesa-4-1-branch host.def xc/xc/extras/Mesa/docs/: Tag: mesa-4-1-branch RELNOTES-4.0.2 VERSIONS xc/xc/extras/Mesa/include/GL/: Tag: mesa-4-1-branch osmesa.h xc/xc/extras/Mesa/src/: Tag: mesa-4-1-branch glheader.h glthread.h mmath.c points.c varray.h xc/xc/extras/Mesa/src/X/: Tag: mesa-4-1-branch fakeglx.c xc/xc/extras/Mesa/src/X86/: Tag: mesa-4-1-branch assyntax.h common_x86_asm.S x86_cliptest.S xc/xc/extras/Mesa/src/tnl/: Tag: mesa-4-1-branch t_array_api.c xc/xc/lib/GL/mesa/src/drv/gamma/: Tag: mesa-4-1-branch gamma_context.h gamma_tex.c gamma_texmem.c gamma_texstate.c xc/xc/lib/GL/mesa/src/drv/i810/: Tag: mesa-4-1-branch i810context.h i810state.c xc/xc/lib/GL/mesa/src/drv/i830/: Tag: mesa-4-1-branch i830_context.h xc/xc/lib/GL/mesa/src/drv/mga/: Tag: mesa-4-1-branch mgacontext.h xc/xc/lib/GL/mesa/src/drv/r128/: Tag: mesa-4-1-branch r128_context.h xc/xc/lib/GL/mesa/src/drv/r200/: Tag: mesa-4-1-branch r200_context.c r200_context.h r200_texmem.c xc/xc/lib/GL/mesa/src/drv/radeon/: Tag: mesa-4-1-branch radeon_context.h xc/xc/lib/GL/mesa/src/drv/tdfx/: Tag: mesa-4-1-branch tdfx_lock.c xc/xc/programs/Xserver/GL/mesa/src/X/: Tag: mesa-4-1-branch xf86glx.c xc/xc/programs/Xserver/hw/xfree86/common/: Tag: mesa-4-1-branch xf86Mode.c xc/xc/programs/Xserver/hw/xfree86/drivers/geode/: Tag: mesa-4-1-branch galstub.c geode.h geode_accel.c geode_cursor.c geode_dga.c geode_driver.c geode_fourcc.h geode_shadow.c geode_video.c panel.c xc/xc/programs/Xserver/hw/xfree86/drivers/geode/panel/: Tag: mesa-4-1-branch 92xx.h cen9211.h dora9211.c dora9211.h drac9210.c drac9210.h panel.c panel.h platform.c pnl_bios.c pnl_init.c xc/xc/programs/Xserver/hw/xfree86/drivers/vmware/: Tag: mesa-4-1-branch svga_limits.h svga_reg.h Revision Changes Path 1.40.4.5 +4 -0 xc/xc/config/cf/host.def 1.2.26.2 +0 -1 xc/xc/extras/Mesa/docs/RELNOTES-4.0.2 1.8.6.3 +3 -2 xc/xc/extras/Mesa/docs/VERSIONS 1.9.18.3 +0 -1 xc/xc/extras/Mesa/include/GL/osmesa.h 1.21.14.3 +1 -0 xc/xc/extras/Mesa/src/glheader.h 1.8.24.3 +1 -1 xc/xc/extras/Mesa/src/glthread.h 1.12.24.3 +1 -1 xc/xc/extras/Mesa/src/mmath.c 1.15.24.3 +0 -1 xc/xc/extras/Mesa/src/points.c 1.11.24.3 +1 -0 xc/xc/extras/Mesa/src/varray.h 1.22.4.3 +14 -1 xc/xc/extras/Mesa/src/X/fakeglx.c 1.13.14.3 +1 -0 xc/xc/extras/Mesa/src/X86/assyntax.h 1.13.4.3 +1 -0 xc/xc/extras/Mesa/src/X86/common_x86_asm.S 1.5.24.3 +1 -0 xc/xc/extras/Mesa/src/X86/x86_cliptest.S 1.5.18.3 +2 -0 xc/xc/extras/Mesa/src/tnl/t_array_api.c 1.3.18.4 +1 -1 xc/xc/lib/GL/mesa/src/drv/gamma/gamma_context.h 1.2.38.5 +4 -1 xc/xc/lib/GL/mesa/src/drv/gamma/gamma_tex.c 1.3.18.4 +0 -1 xc/xc/lib/GL/mesa/src/drv/gamma/gamma_texmem.c 1.2.38.5 +0 -1 xc/xc/lib/GL/mesa/src/drv/gamma/gamma_texstate.c 1.12.18.3 +1 -1 xc/xc/lib/GL/mesa/src/drv/i810/i810context.h 1.16.16.6 +0 -1 xc/xc/lib/GL/mesa/src/drv/i810/i810state.c 1.2.4.4 +1 -1 xc/xc/lib/GL/mesa/src/drv/i830/i830_context.h 1.15.18.4 +1 -1 xc/xc/lib/GL/mesa/src/drv/mga/mgacontext.h 1.28.18.4 +1 -1 xc/xc/lib/GL/mesa/src/drv/r128/r128_context.h 1.10.2.11 +0 -1 xc/xc/lib/GL/mesa/src/drv/r200/r200_context.c 1.6.4.6 +1 -1 xc/xc/lib/GL/mesa/src/drv/r200/r200_context.h 1.3.4.7 +1 -2 xc/xc/lib/GL/mesa/src/drv/r200/r200_texmem.c 1.16.4.3 +1 -1 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_context.h 1.8.38.3 +1 -1 xc/xc/lib/GL/mesa/src/drv/tdfx/tdfx_lock.c 1.15.18.4 +22 -2 xc/xc/programs/Xserver/GL/mesa/src/X/xf86glx.c 1.1.1.14.38.2 +68 -16 xc/xc/programs/Xserver/hw/xfree86/common/xf86Mode.c 1.2.10.2 +0 -0 xc/xc/programs/Xserver/hw/xfree86/drivers/geode/galstub.c 1.2.10.2 +0 -0 xc/xc/programs/Xserver/hw/xfree86/drivers/geode/geode.h 1.2.10.2 +0 -0 xc/xc/programs/Xserver/hw/xfree86/drivers/geode/geode_accel.c 1.2.10.2 +0 -0 xc/xc/programs/Xserver/hw/xfree86/drivers/geode/geode_cursor.c 1.2.10.2 +0 -0 xc/xc/programs/Xserver/hw/xfree86/drivers/geode/geode_dga.c 1.2.10.2 +0 -0 xc/xc/programs/Xserver/hw/xfree86/drivers/geode/geode_driver.c 1.2.10.2 +0 -0 xc/xc/programs/Xserver/hw/xfree86/drivers/geode/geode_fourcc.h 1.2.10.2 +0 -0 xc/xc/programs/Xserver/hw/xfree86/drivers/geode/geode_shadow.c 1.2.10.2 +0 -0 xc/xc/programs/Xserver/hw/xfree86/drivers/geode/geode_video.c 1.2.10.2 +0 -0 xc/xc/programs/Xserver/hw/xfree86/drivers/geode/panel.c 1.2.10.2 +0 -0 xc/xc/programs/Xserver/hw/xfree86/drivers/geode/panel/92xx.h 1.2.10.2 +0 -0 xc/xc/programs/Xserver/hw/xfree86/drivers/geode/panel/cen9211.h 1.2.10.2 +0 -0 xc/xc/programs/Xserver/hw/xfree86/drivers/geode/panel/dora9211.c 1.2.10.2 +0 -0 xc/xc/programs/Xserver/hw/xfree86/drivers/geode/panel/dora9211.h 1.2.10.2 +0 -0 xc/xc/programs/Xserver/hw/xfree86/drivers/geode/panel/drac9210.c 1.2.10.2 +0 -0 xc/xc/programs/Xserver/hw/xfree86/drivers/geode/panel/drac9210.h 1.2.10.2 +0 -0 xc/xc/programs/Xserver/hw/xfree86/drivers/geode/panel/panel.c 1.2.10.2 +0 -0 xc/xc/programs/Xserver/hw/xfree86/drivers/geode/panel/panel.h 1.2.10.2 +0 -0 xc/xc/programs/Xserver/hw/xfree86/drivers/geode/panel/platform.c 1.2.10.2 +0 -0 xc/xc/programs/Xserver/hw/xfree86/drivers/geode/panel/pnl_bios.c 1.2.10.2 +0 -0 xc/xc/programs/Xserver/hw/xfree86/drivers/geode/panel/pnl_init.c 1.1.1.1.48.3 +0 -0 xc/xc/programs/Xserver/hw/xfree86/drivers/vmware/svga_limits.h 1.2.38.3 +0 -0 xc/xc/programs/Xserver/hw/xfree86/drivers/vmware/svga_reg.h |