From: Ian R. <id...@us...> - 2003-04-07 21:57:13
|
CVSROOT: /cvsroot/dri Module name: xc Repository: xc/xc/programs/Xserver/hw/xfree86/os-support/vbe/ Changes by: idr@sc8-pr-cvs1. 03/04/07 14:57:12 Log message: "Final" round of trunk-to-branch merges. Modified files: xc/xc/extras/Mesa/docs/: Tag: texmem-0-0-1 VERSIONS xc/xc/extras/Mesa/include/GL/: Tag: texmem-0-0-1 gl.h glext.h xmesa.h xmesa_x.h xmesa_xf86.h xc/xc/extras/Mesa/src/: Tag: texmem-0-0-1 config.h context.c dd.h dlist.c enable.c extensions.c get.c glheader.h glthread.h imports.c imports.h light.c mmath.c mmath.h mtypes.h pixel.c points.c texcompress.c teximage.c texobj.c texstate.c texstate.h texstore.c texutil_tmp.h varray.h vpexec.c vpexec.h vpparse.c vpparse.h vpstate.c vpstate.h xc/xc/extras/Mesa/src/OSmesa/: Tag: texmem-0-0-1 osmesa.c xc/xc/extras/Mesa/src/X/: Tag: texmem-0-0-1 fakeglx.c xm_api.c xm_dd.c xm_span.c xmesaP.h xc/xc/extras/Mesa/src/X86/: Tag: texmem-0-0-1 3dnow.c assyntax.h common_x86.c common_x86_asm.S common_x86_features.h mmx.h x86_cliptest.S xc/xc/extras/Mesa/src/swrast/: Tag: texmem-0-0-1 s_aaline.c s_aalinetemp.h s_aatriangle.c s_aatritemp.h s_lines.c s_span.c s_texture.c s_tritemp.h s_zoom.c xc/xc/extras/Mesa/src/tnl/: Tag: texmem-0-0-1 t_imm_api.c t_imm_exec.c t_vb_program.c t_vb_texgen.c t_vtx_api.c t_vtx_api.h t_vtx_exec.c t_vtx_sse.c t_vtx_x86.c xc/xc/extras/Mesa/src/tnl_dd/: Tag: texmem-0-0-1 t_dd_vbtmp.h xc/xc/include/GL/: Tag: texmem-0-0-1 glx.h glxproto.h xc/xc/lib/GL/dri/: Tag: texmem-0-0-1 dri_util.c xc/xc/lib/GL/dri/drm/: Tag: texmem-0-0-1 Imakefile xc/xc/lib/GL/glx/: Tag: texmem-0-0-1 glxclient.h glxcmds.c glxext.c pixel.c single2.c xc/xc/lib/GL/mesa/src/X86/: Tag: texmem-0-0-1 Imakefile xc/xc/lib/GL/mesa/src/drv/common/: Tag: texmem-0-0-1 vblank.h xc/xc/lib/GL/mesa/src/drv/ffb/: Tag: texmem-0-0-1 ffb_points.c ffb_rendertmp.h ffb_state.c ffb_tris.c ffb_vb.c ffb_vb.h ffb_xmesa.c xc/xc/lib/GL/mesa/src/drv/gamma/: Tag: texmem-0-0-1 gamma_inithw.c gamma_lock.c gamma_state.c gamma_texstate.c xc/xc/lib/GL/mesa/src/drv/mga/: Tag: texmem-0-0-1 mga_xmesa.c mga_xmesa.h mgacontext.h mgadd.c mgaioctl.c mgaioctl.h mgapixel.c mgapixel.h mgarender.c mgaspan.c mgastate.c mgastate.h mgatex.c mgatexmem.c mgatris.c mgatris.h mgavb.c mgavb.h xc/xc/lib/GL/mesa/src/drv/r128/: Tag: texmem-0-0-1 r128_context.c r128_context.h r128_dd.c r128_ioctl.h r128_lock.c r128_lock.h r128_screen.c r128_screen.h r128_span.c r128_state.c r128_tex.c r128_tris.c r128_tris.h r128_vb.c r128_vb.h xc/xc/lib/GL/mesa/src/drv/r200/: Tag: texmem-0-0-1 r200_cmdbuf.c r200_context.c r200_ioctl.c r200_maos_arrays.c r200_span.c r200_state.c r200_swtcl.c r200_tcl.c r200_tex.c r200_texmem.c r200_texstate.c r200_vtxfmt.c xc/xc/lib/GL/mesa/src/drv/radeon/: Tag: texmem-0-0-1 Imakefile.inc radeon_context.c radeon_context.h radeon_ioctl.c radeon_ioctl.h radeon_lock.c radeon_lock.h radeon_screen.c radeon_screen.h radeon_span.c radeon_state.c radeon_state.h radeon_state_init.c radeon_swtcl.c radeon_tcl.c radeon_texmem.c radeon_texstate.c radeon_vtxfmt.c xc/xc/programs/Xserver/GL/dri/: Tag: texmem-0-0-1 dri.c dristruct.h xc/xc/programs/Xserver/hw/xfree86/drivers/mga/: Tag: texmem-0-0-1 mga_dri.c xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/: Tag: texmem-0-0-1 drm_proc.h Removed files: xc/xc/extras/Mesa/src/X86/: Tag: texmem-0-0-1 x86_vertex.S xc/xc/programs/Xserver/hw/xfree86/drivers/geode/: Tag: texmem-0-0-1 Imakefile durango.c galstub.c geode.h geode.man geode_accel.c geode_cursor.c geode_dga.c geode_driver.c geode_fourcc.h geode_shadow.c geode_video.c panel.c regacc.c xc/xc/programs/Xserver/hw/xfree86/drivers/geode/gfx/: Tag: texmem-0-0-1 disp_gu1.c disp_gu2.c durango.c gfx_dcdr.c gfx_defs.h gfx_disp.c gfx_i2c.c gfx_init.c gfx_mode.h gfx_msr.c gfx_regs.h gfx_rndr.c gfx_rtns.h gfx_tv.c gfx_type.h gfx_vga.c gfx_vid.c gfx_vip.c history.h i2c_acc.c i2c_gpio.c init_gu1.c init_gu2.c msr_rdcl.c release.txt rndr_gu1.c rndr_gu2.c saa7114.c tv_1200.c tv_fs450.c tv_fs450.h vga_gu1.c vid_1200.c vid_5530.c vid_rdcl.c vip_1200.c xc/xc/programs/Xserver/hw/xfree86/drivers/geode/panel/: Tag: texmem-0-0-1 92xx.h cen9211.c cen9211.h dora9211.c dora9211.h drac9210.c drac9210.h panel.c panel.h platform.c pnl_bios.c pnl_defs.h pnl_init.c readme.txt xc/xc/programs/Xserver/hw/xfree86/os-support/vbe/: Tag: texmem-0-0-1 Imakefile vbe.c vbe.h vbeModes.c vbeModes.h vbe_module.c Revision Changes Path 1.8.4.4 +46 -9 xc/xc/extras/Mesa/docs/VERSIONS 1.26.2.3 +0 -2 xc/xc/extras/Mesa/include/GL/gl.h 1.20.2.2 +0 -8 xc/xc/extras/Mesa/include/GL/glext.h 1.12.16.2 +0 -1 xc/xc/extras/Mesa/include/GL/xmesa.h 1.7.14.2 +1 -1 xc/xc/extras/Mesa/include/GL/xmesa_x.h 1.8.14.2 +1 -1 xc/xc/extras/Mesa/include/GL/xmesa_xf86.h 1.18.2.3 +0 -1 xc/xc/extras/Mesa/src/config.h 1.28.2.4 +8 -7 xc/xc/extras/Mesa/src/context.c 1.19.12.3 +1 -0 xc/xc/extras/Mesa/src/dd.h 1.20.16.4 +0 -1 xc/xc/extras/Mesa/src/dlist.c 1.19.2.3 +0 -1 xc/xc/extras/Mesa/src/enable.c 1.23.2.6 +0 -1 xc/xc/extras/Mesa/src/extensions.c 1.25.2.4 +57 -23 xc/xc/extras/Mesa/src/get.c 1.21.12.3 +0 -1 xc/xc/extras/Mesa/src/glheader.h 1.8.22.4 +1 -1 xc/xc/extras/Mesa/src/glthread.h 1.4.22.4 +0 -1 xc/xc/extras/Mesa/src/imports.c 1.4.22.4 +0 -1 xc/xc/extras/Mesa/src/imports.h 1.13.22.2 +0 -5 xc/xc/extras/Mesa/src/light.c 1.12.22.3 +1 -1 xc/xc/extras/Mesa/src/mmath.c 1.29.10.3 +8 -13 xc/xc/extras/Mesa/src/mmath.h 1.8.2.6 +0 -1 xc/xc/extras/Mesa/src/mtypes.h 1.15.2.3 +0 -1 xc/xc/extras/Mesa/src/pixel.c 1.15.22.3 +1 -0 xc/xc/extras/Mesa/src/points.c 1.2.2.3 +0 -1 xc/xc/extras/Mesa/src/texcompress.c 1.32.2.4 +3 -4 xc/xc/extras/Mesa/src/teximage.c 1.25.2.5 +2 -4 xc/xc/extras/Mesa/src/texobj.c 1.29.2.8 +0 -1 xc/xc/extras/Mesa/src/texstate.c 1.10.12.3 +3 -2 xc/xc/extras/Mesa/src/texstate.h 1.7.2.4 +1 -1 xc/xc/extras/Mesa/src/texstore.c 1.8.2.3 +1 -0 xc/xc/extras/Mesa/src/texutil_tmp.h 1.11.22.3 +0 -1 xc/xc/extras/Mesa/src/varray.h 1.1.4.2 +8 -13 xc/xc/extras/Mesa/src/vpexec.c 1.1.4.2 +0 -1 xc/xc/extras/Mesa/src/vpexec.h 1.1.4.2 +3 -4 xc/xc/extras/Mesa/src/vpparse.c 1.1.4.2 +0 -1 xc/xc/extras/Mesa/src/vpparse.h 1.1.4.2 +0 -1 xc/xc/extras/Mesa/src/vpstate.c 1.1.4.2 +0 -1 xc/xc/extras/Mesa/src/vpstate.h 1.18.10.3 +1 -0 xc/xc/extras/Mesa/src/OSmesa/osmesa.c 1.22.2.3 +3 -4 xc/xc/extras/Mesa/src/X/fakeglx.c 1.9.4.3 +1 -4 xc/xc/extras/Mesa/src/X/xm_api.c 1.10.2.3 +4 -4 xc/xc/extras/Mesa/src/X/xm_dd.c 1.4.22.2 +0 -2 xc/xc/extras/Mesa/src/X/xm_span.c 1.18.22.3 +0 -1 xc/xc/extras/Mesa/src/X/xmesaP.h 1.12.22.2 +5 -2 xc/xc/extras/Mesa/src/X86/3dnow.c 1.13.12.3 +0 -1 xc/xc/extras/Mesa/src/X86/assyntax.h 1.15.10.4 +0 -1 xc/xc/extras/Mesa/src/X86/common_x86.c 1.13.2.6 +0 -1 xc/xc/extras/Mesa/src/X86/common_x86_asm.S 1.5.22.4 +0 -1 xc/xc/extras/Mesa/src/X86/common_x86_features.h 1.6.22.3 +0 -1 xc/xc/extras/Mesa/src/X86/mmx.h 1.5.22.3 +0 -1 xc/xc/extras/Mesa/src/X86/x86_cliptest.S 1.4.22.3 +0 -1 xc/xc/extras/Mesa/src/swrast/s_aaline.c 1.4.22.3 +0 -1 xc/xc/extras/Mesa/src/swrast/s_aalinetemp.h 1.4.22.3 +0 -1 xc/xc/extras/Mesa/src/swrast/s_aatriangle.c 1.4.22.3 +0 -1 xc/xc/extras/Mesa/src/swrast/s_aatritemp.h 1.4.22.2 +25 -3 xc/xc/extras/Mesa/src/swrast/s_lines.c 1.5.16.3 +0 -1 xc/xc/extras/Mesa/src/swrast/s_span.c 1.8.2.5 +270 -59 xc/xc/extras/Mesa/src/swrast/s_texture.c 1.4.22.3 +0 -2 xc/xc/extras/Mesa/src/swrast/s_tritemp.h 1.5.16.3 +0 -1 xc/xc/extras/Mesa/src/swrast/s_zoom.c 1.7.12.4 +0 -1 xc/xc/extras/Mesa/src/tnl/t_imm_api.c 1.6.16.2 +4 -2 xc/xc/extras/Mesa/src/tnl/t_imm_exec.c 1.2.4.2 +0 -1 xc/xc/extras/Mesa/src/tnl/t_vb_program.c 1.4.22.2 +4 -3 xc/xc/extras/Mesa/src/tnl/t_vb_texgen.c 1.2.2.2 +0 -1 xc/xc/extras/Mesa/src/tnl/t_vtx_api.c 1.2.2.2 +0 -1 xc/xc/extras/Mesa/src/tnl/t_vtx_api.h 1.2.2.2 +0 -1 xc/xc/extras/Mesa/src/tnl/t_vtx_exec.c 1.2.2.2 +0 -1 xc/xc/extras/Mesa/src/tnl/t_vtx_sse.c 1.2.2.2 +0 -1 xc/xc/extras/Mesa/src/tnl/t_vtx_x86.c 1.8.10.4 +2 -2 xc/xc/extras/Mesa/src/tnl_dd/t_dd_vbtmp.h 1.16.2.3 +1 -1 xc/xc/include/GL/glx.h 1.7.36.5 +1 -0 xc/xc/include/GL/glxproto.h 1.3.20.6 +1 -1 xc/xc/lib/GL/dri/dri_util.c 1.22.16.3 +1 -1 xc/xc/lib/GL/dri/drm/Imakefile 1.19.4.6 +6 -1 xc/xc/lib/GL/glx/glxclient.h 1.29.2.8 +66 -5 xc/xc/lib/GL/glx/glxcmds.c 1.23.16.7 +1 -1 xc/xc/lib/GL/glx/glxext.c 1.8.12.2 +1 -1 xc/xc/lib/GL/glx/pixel.c 1.4.36.2 +2 -1 xc/xc/lib/GL/glx/single2.c 1.24.24.4 +1 -1 xc/xc/lib/GL/mesa/src/X86/Imakefile 1.1.2.2 +1 -0 xc/xc/lib/GL/mesa/src/drv/common/Attic/vblank.h 1.2.36.3 +1 -1 xc/xc/lib/GL/mesa/src/drv/ffb/ffb_points.c 1.2.36.2 +1 -1 xc/xc/lib/GL/mesa/src/drv/ffb/ffb_rendertmp.h 1.5.10.3 +2 -2 xc/xc/lib/GL/mesa/src/drv/ffb/ffb_state.c 1.2.36.3 +2 -2 xc/xc/lib/GL/mesa/src/drv/ffb/ffb_tris.c 1.5.36.3 +1 -0 xc/xc/lib/GL/mesa/src/drv/ffb/ffb_vb.c 1.2.36.2 +0 -1 xc/xc/lib/GL/mesa/src/drv/ffb/ffb_vb.h 1.6.36.3 +0 -1 xc/xc/lib/GL/mesa/src/drv/ffb/ffb_xmesa.c 1.9.16.2 +1 -1 xc/xc/lib/GL/mesa/src/drv/gamma/gamma_inithw.c 1.2.36.3 +1 -0 xc/xc/lib/GL/mesa/src/drv/gamma/gamma_lock.c 1.3.10.3 +1 -0 xc/xc/lib/GL/mesa/src/drv/gamma/gamma_state.c 1.2.36.3 +4 -0 xc/xc/lib/GL/mesa/src/drv/gamma/gamma_texstate.c 1.38.10.12 +1 -1 xc/xc/lib/GL/mesa/src/drv/mga/mga_xmesa.c 1.18.16.2 +2 -2 xc/xc/lib/GL/mesa/src/drv/mga/mga_xmesa.h 1.15.16.9 +1 -1 xc/xc/lib/GL/mesa/src/drv/mga/mgacontext.h 1.34.2.8 +1 -1 xc/xc/lib/GL/mesa/src/drv/mga/mgadd.c 1.29.16.6 +1 -1 xc/xc/lib/GL/mesa/src/drv/mga/mgaioctl.c 1.18.16.4 +1 -1 xc/xc/lib/GL/mesa/src/drv/mga/mgaioctl.h 1.12.16.5 +1 -1 xc/xc/lib/GL/mesa/src/drv/mga/mgapixel.c 1.6.36.2 +1 -1 xc/xc/lib/GL/mesa/src/drv/mga/mgapixel.h 1.4.36.4 +1 -1 xc/xc/lib/GL/mesa/src/drv/mga/mgarender.c 1.26.36.4 +1 -1 xc/xc/lib/GL/mesa/src/drv/mga/mgaspan.c 1.34.36.6 +1 -1 xc/xc/lib/GL/mesa/src/drv/mga/mgastate.c 1.6.36.3 +1 -1 xc/xc/lib/GL/mesa/src/drv/mga/mgastate.h 1.37.2.8 +1 -1 xc/xc/lib/GL/mesa/src/drv/mga/mgatex.c 1.10.36.6 +1 -1 xc/xc/lib/GL/mesa/src/drv/mga/mgatexmem.c 1.21.10.4 +1 -1 xc/xc/lib/GL/mesa/src/drv/mga/mgatris.c 1.16.36.3 +1 -1 xc/xc/lib/GL/mesa/src/drv/mga/mgatris.h 1.26.10.5 +1 -1 xc/xc/lib/GL/mesa/src/drv/mga/mgavb.c 1.10.36.2 +1 -1 xc/xc/lib/GL/mesa/src/drv/mga/mgavb.h 1.18.36.6 +1 -1 xc/xc/lib/GL/mesa/src/drv/r128/r128_context.c 1.28.16.4 +1 -1 xc/xc/lib/GL/mesa/src/drv/r128/r128_context.h 1.26.22.5 +1 -1 xc/xc/lib/GL/mesa/src/drv/r128/r128_dd.c 1.8.16.2 +1 -1 xc/xc/lib/GL/mesa/src/drv/r128/r128_ioctl.h 1.9.36.4 +1 -1 xc/xc/lib/GL/mesa/src/drv/r128/r128_lock.c 1.9.48.2 +2 -2 xc/xc/lib/GL/mesa/src/drv/r128/r128_lock.h 1.16.16.4 +1 -16 xc/xc/lib/GL/mesa/src/drv/r128/r128_screen.c 1.12.36.2 +1 -1 xc/xc/lib/GL/mesa/src/drv/r128/r128_screen.h 1.17.36.3 +1 -1 xc/xc/lib/GL/mesa/src/drv/r128/r128_span.c 1.23.10.7 +1 -1 xc/xc/lib/GL/mesa/src/drv/r128/r128_state.c 1.24.24.8 +1 -1 xc/xc/lib/GL/mesa/src/drv/r128/r128_tex.c 1.20.10.5 +1 -1 xc/xc/lib/GL/mesa/src/drv/r128/r128_tris.c 1.19.36.2 +1 -1 xc/xc/lib/GL/mesa/src/drv/r128/r128_tris.h 1.19.10.4 +1 -1 xc/xc/lib/GL/mesa/src/drv/r128/r128_vb.c 1.14.36.2 +1 -1 xc/xc/lib/GL/mesa/src/drv/r128/r128_vb.h 1.2.2.4 +1 -0 xc/xc/lib/GL/mesa/src/drv/r200/r200_cmdbuf.c 1.9.2.10 +1 -2 xc/xc/lib/GL/mesa/src/drv/r200/r200_context.c 1.9.2.6 +2 -0 xc/xc/lib/GL/mesa/src/drv/r200/r200_ioctl.c 1.3.2.5 +0 -1 xc/xc/lib/GL/mesa/src/drv/r200/r200_maos_arrays.c 1.2.4.4 +1 -0 xc/xc/lib/GL/mesa/src/drv/r200/r200_span.c 1.3.2.5 +0 -1 xc/xc/lib/GL/mesa/src/drv/r200/r200_state.c 1.3.2.5 +6 -5 xc/xc/lib/GL/mesa/src/drv/r200/r200_swtcl.c 1.3.2.3 +4 -2 xc/xc/lib/GL/mesa/src/drv/r200/r200_tcl.c 1.3.2.8 +0 -1 xc/xc/lib/GL/mesa/src/drv/r200/r200_tex.c 1.3.2.8 +0 -1 xc/xc/lib/GL/mesa/src/drv/r200/r200_texmem.c 1.4.2.9 +0 -1 xc/xc/lib/GL/mesa/src/drv/r200/r200_texstate.c 1.2.4.7 +7 -6 xc/xc/lib/GL/mesa/src/drv/r200/r200_vtxfmt.c 1.6.12.2 +1 -1 xc/xc/lib/GL/mesa/src/drv/radeon/Imakefile.inc 1.20.2.14 +2 -1 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_context.c 1.16.2.7 +9 -5 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_context.h 1.30.2.7 +2 -1 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_ioctl.c 1.7.2.4 +1 -1 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_ioctl.h 1.10.10.5 +1 -1 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_lock.c 1.5.14.3 +1 -1 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_lock.h 1.10.2.7 +1 -1 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_screen.c 1.9.2.4 +1 -1 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_screen.h 1.13.4.4 +1 -1 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_span.c 1.18.4.6 +1 -26 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_state.c 1.5.14.3 +1 -1 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_state.h 1.5.2.5 +0 -1 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_state_init.c 1.6.2.7 +5 -5 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_swtcl.c 1.4.4.3 +1 -2 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_tcl.c 1.11.14.10 +1 -2 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_texmem.c 1.8.2.10 +1 -2 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_texstate.c 1.4.12.7 +4 -7 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_vtxfmt.c 1.43.2.3 +1 -1 xc/xc/programs/Xserver/GL/dri/dri.c 1.11.46.3 +1 -1 xc/xc/programs/Xserver/GL/dri/dristruct.h 1.44.16.5 +1 -0 xc/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c 1.5.42.3 +4 -4 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm_proc.h |