From: Alan H. <al...@us...> - 2002-06-12 21:07:54
|
CVSROOT: /cvsroot/dri Module name: xc Repository: xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/ Changes by: alanh@usw-pr-cvs1. 02/06/12 14:07:53 Log message: bring the bsd-3-0-0 branch up-to-date with the trunk Modified files: xc/xc/config/cf/: Tag: bsd-3-0-0-branch host.def xfree86.cf xc/xc/extras/Mesa/include/GL/: Tag: bsd-3-0-0-branch glext.h xmesa_x.h xmesa_xf86.h xc/xc/extras/Mesa/src/: Tag: bsd-3-0-0-branch api_arrayelt.c attrib.c buffers.c context.c dd.h macros.h mmath.h mtypes.h texformat_tmp.h texutil.c xc/xc/extras/Mesa/src/OSmesa/: Tag: bsd-3-0-0-branch osmesa.c xc/xc/extras/Mesa/src/math/: Tag: bsd-3-0-0-branch m_clip_tmp.h xc/xc/extras/Mesa/src/swrast/: Tag: bsd-3-0-0-branch s_context.c xc/xc/extras/Mesa/src/tnl/: Tag: bsd-3-0-0-branch t_imm_api.c t_imm_dlist.c xc/xc/extras/Mesa/src/tnl_dd/: Tag: bsd-3-0-0-branch t_dd_vbtmp.h t_dd_vertex.h xc/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/: Tag: bsd-3-0-0-branch quicksort.cc xc/xc/lib/GL/dri/: Tag: bsd-3-0-0-branch xf86dristr.h xc/xc/lib/GL/glx/: Tag: bsd-3-0-0-branch glxcmds.c xc/xc/lib/GL/mesa/src/drv/: Tag: bsd-3-0-0-branch Imakefile xc/xc/lib/GL/mesa/src/drv/ffb/: Tag: bsd-3-0-0-branch ffb_state.c xc/xc/lib/GL/mesa/src/drv/gamma/: Tag: bsd-3-0-0-branch gamma_dd.c xc/xc/lib/GL/mesa/src/drv/i810/: Tag: bsd-3-0-0-branch i810context.c i810state.c i810vb.c xc/xc/lib/GL/mesa/src/drv/i830/: Tag: bsd-3-0-0-branch Imakefile Imakefile.inc i830_3d_reg.h i830_drv.h i830_ioctl.c i830_ioctl.h i830_span.c i830_state.c i830_tex.c i830_tris.c i830_tris.h i830_vb.c i830_vert_form_points.h i830_vert_form_tris.h xc/xc/lib/GL/mesa/src/drv/mga/: Tag: bsd-3-0-0-branch mgabuffers.c mgabuffers.h mgavb.c xc/xc/lib/GL/mesa/src/drv/r128/: Tag: bsd-3-0-0-branch r128_state.c r128_tris.c xc/xc/lib/GL/mesa/src/drv/radeon/: Tag: bsd-3-0-0-branch Imakefile.inc radeon_context.c radeon_context.h radeon_ioctl.c radeon_ioctl.h radeon_lock.c radeon_lock.h radeon_render.c radeon_screen.c radeon_screen.h radeon_span.c radeon_state.c radeon_state.h radeon_tex.c radeon_texmem.c radeon_texstate.c radeon_tris.c radeon_vb.c radeon_vtxfmt.c radeon_vtxfmt.h xc/xc/lib/GL/mesa/src/drv/sis/: Tag: bsd-3-0-0-branch sis_mesa.c sis_mesa.h xc/xc/lib/GL/mesa/src/drv/tdfx/: Tag: bsd-3-0-0-branch tdfx_state.c tdfx_vb.c xc/xc/programs/Xserver/GL/dri/: Tag: bsd-3-0-0-branch dri.c dri.h xc/xc/programs/Xserver/hw/xfree86/common/: Tag: bsd-3-0-0-branch xf86PciInfo.h xc/xc/programs/Xserver/hw/xfree86/drivers/ati/: Tag: bsd-3-0-0-branch Imakefile radeon.h radeon_common.h radeon_dri.c radeon_dri.h radeon_dripriv.h radeon_driver.c radeon_reg.h radeon_sarea.h xc/xc/programs/Xserver/hw/xfree86/drivers/i810/: Tag: bsd-3-0-0-branch Imakefile i810.h i810_cursor.c i810_driver.c i810_io.c i810_memory.c i830_common.h i830_driver.c xc/xc/programs/Xserver/hw/xfree86/os-support/: Tag: bsd-3-0-0-branch xf86drm.h xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/: Tag: bsd-3-0-0-branch drm_memory.h xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/: Tag: bsd-3-0-0-branch Imakefile drm.h i830_dma.c r128_drv.h radeon_cp.c radeon_drm.h radeon_drv.c radeon_drv.h radeon_state.c Added files: xc/xc/extras/Mesa/src/tnl_dd/: Tag: bsd-3-0-0-branch t_dd_dmatmp2.h t_dd_triemit.h xc/xc/lib/GL/mesa/src/drv/i830/: Tag: bsd-3-0-0-branch i830_context.c i830_context.h i830_debug.c i830_debug.h i830_render.c i830_screen.c i830_screen.h i830_span.h i830_state.h i830_tex.h i830_texmem.c i830_texstate.c i830_vb.h xc/xc/lib/GL/mesa/src/drv/radeon/: Tag: bsd-3-0-0-branch radeon_compat.c radeon_maos.c radeon_maos.h radeon_maos_arrays.c radeon_maos_verts.c radeon_sanity.c radeon_sanity.h radeon_state_init.c radeon_swtcl.c radeon_swtcl.h radeon_tcl.c radeon_tcl.h radeon_tcl_vbtmp.h radeon_vtxfmt_c.c radeon_vtxfmt_sse.c radeon_vtxfmt_x86.c radeon_vtxtmp_x86.S Removed files: xc/xc/lib/GL/mesa/src/drv/radeon/: Tag: bsd-3-0-0-branch radeon_tris.h radeon_vb.h Revision Changes Path 1.32.6.2 +8 -2 xc/xc/config/cf/host.def 1.38.2.1 +1 -1 xc/xc/config/cf/xfree86.cf 1.15.6.3 +70 -91 xc/xc/extras/Mesa/include/GL/glext.h 1.6.4.1 +0 -1 xc/xc/extras/Mesa/include/GL/xmesa_x.h 1.7.4.1 +0 -1 xc/xc/extras/Mesa/include/GL/xmesa_xf86.h 1.3.4.3 +2 -2 xc/xc/extras/Mesa/src/api_arrayelt.c 1.16.4.2 +1 -1 xc/xc/extras/Mesa/src/attrib.c 1.11.4.3 +3 -15 xc/xc/extras/Mesa/src/buffers.c 1.20.4.3 +0 -1 xc/xc/extras/Mesa/src/context.c 1.16.4.2 +4 -6 xc/xc/extras/Mesa/src/dd.h 1.12.4.2 +46 -2 xc/xc/extras/Mesa/src/macros.h 1.24.4.3 +2 -2 xc/xc/extras/Mesa/src/mmath.h 1.3.4.3 +2 -3 xc/xc/extras/Mesa/src/mtypes.h 1.3.4.2 +3 -3 xc/xc/extras/Mesa/src/texformat_tmp.h 1.15.4.2 +54 -32 xc/xc/extras/Mesa/src/texutil.c 1.11.4.3 +1 -7 xc/xc/extras/Mesa/src/OSmesa/osmesa.c 1.3.4.2 +2 -2 xc/xc/extras/Mesa/src/math/m_clip_tmp.h 1.3.4.3 +2 -4 xc/xc/extras/Mesa/src/swrast/s_context.c 1.3.4.3 +13 -15 xc/xc/extras/Mesa/src/tnl/t_imm_api.c 1.3.4.3 +6 -0 xc/xc/extras/Mesa/src/tnl/t_imm_dlist.c 1.3.4.2 +29 -15 xc/xc/extras/Mesa/src/tnl_dd/t_dd_vbtmp.h 1.3.4.2 +12 -16 xc/xc/extras/Mesa/src/tnl_dd/t_dd_vertex.h 1.1.1.1.18.2 +0 -0 xc/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/quicksort.cc 1.9.16.1 +10 -2 xc/xc/lib/GL/dri/xf86dristr.h 1.23.2.3 +2 -2 xc/xc/lib/GL/glx/glxcmds.c 1.16.16.1 +1 -1 xc/xc/lib/GL/mesa/src/drv/Imakefile 1.2.6.2 +2 -4 xc/xc/lib/GL/mesa/src/drv/ffb/ffb_state.c 1.2.6.2 +1 -0 xc/xc/lib/GL/mesa/src/drv/gamma/gamma_dd.c 1.6.4.2 +2 -3 xc/xc/lib/GL/mesa/src/drv/i810/i810context.c 1.13.6.2 +1 -4 xc/xc/lib/GL/mesa/src/drv/i810/i810state.c 1.15.6.2 +2 -2 xc/xc/lib/GL/mesa/src/drv/i810/i810vb.c 1.2.2.1 +1 -2 xc/xc/lib/GL/mesa/src/drv/i830/Imakefile 1.1.1.1.6.1 +68 -52 xc/xc/lib/GL/mesa/src/drv/i830/Imakefile.inc 1.1.1.1.6.1 +5 -0 xc/xc/lib/GL/mesa/src/drv/i830/i830_3d_reg.h 1.1.1.1.6.1 +21 -374 xc/xc/lib/GL/mesa/src/drv/i830/i830_drv.h 1.1.1.1.6.1 +250 -277 xc/xc/lib/GL/mesa/src/drv/i830/i830_ioctl.c 1.1.1.1.6.1 +47 -68 xc/xc/lib/GL/mesa/src/drv/i830/i830_ioctl.h 1.1.1.1.6.1 +102 -81 xc/xc/lib/GL/mesa/src/drv/i830/i830_span.c 1.1.1.1.6.1 +592 -766 xc/xc/lib/GL/mesa/src/drv/i830/i830_state.c 1.1.1.1.6.1 +319 -2039 xc/xc/lib/GL/mesa/src/drv/i830/i830_tex.c 1.1.1.1.6.1 +781 -119 xc/xc/lib/GL/mesa/src/drv/i830/i830_tris.c 1.1.1.1.6.1 +28 -254 xc/xc/lib/GL/mesa/src/drv/i830/i830_tris.h 1.1.1.1.6.1 +518 -406 xc/xc/lib/GL/mesa/src/drv/i830/i830_vb.c 1.1.1.1.6.1 +1 -1 xc/xc/lib/GL/mesa/src/drv/i830/i830_vert_form_points.h 1.1.1.1.6.1 +1 -1 xc/xc/lib/GL/mesa/src/drv/i830/i830_vert_form_tris.h 1.17.6.1 +1 -4 xc/xc/lib/GL/mesa/src/drv/mga/mgabuffers.c 1.8.6.1 +1 -1 xc/xc/lib/GL/mesa/src/drv/mga/mgabuffers.h 1.24.6.1 +3 -3 xc/xc/lib/GL/mesa/src/drv/mga/mgavb.c 1.19.6.2 +1 -5 xc/xc/lib/GL/mesa/src/drv/r128/r128_state.c 1.16.6.1 +1 -1 xc/xc/lib/GL/mesa/src/drv/r128/r128_tris.c 1.4.6.1 +68 -19 xc/xc/lib/GL/mesa/src/drv/radeon/Imakefile.inc 1.8.4.2 +222 -137 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_context.c 1.9.6.2 +520 -60 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_context.h 1.12.4.2 +605 -515 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_ioctl.c 1.4.6.2 +98 -48 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_ioctl.h 1.7.6.1 +31 -16 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_lock.c 1.4.6.1 +10 -9 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_lock.h 1.2.6.1 +0 -2 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_render.c 1.8.6.1 +44 -8 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_screen.c 1.5.6.2 +5 -0 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_screen.h 1.11.6.1 +15 -5 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_span.c 1.10.6.2 +1191 -401 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_state.c 1.4.6.1 +15 -2 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_state.h 1.14.6.1 +48 -133 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_tex.c 1.9.6.2 +21 -20 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_texmem.c 1.4.6.1 +254 -34 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_texstate.c 1.5.6.1 +15 -7 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_tris.c 1.6.6.1 +3 -3 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_vb.c 1.2.6.1 +883 -559 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_vtxfmt.c 1.2.6.1 +111 -29 xc/xc/lib/GL/mesa/src/drv/radeon/radeon_vtxfmt.h 1.5.6.1 +2 -1 xc/xc/lib/GL/mesa/src/drv/sis/sis_mesa.c 1.3.36.1 +1 -1 xc/xc/lib/GL/mesa/src/drv/sis/sis_mesa.h 1.13.6.1 +5 -5 xc/xc/lib/GL/mesa/src/drv/tdfx/tdfx_state.c 1.4.6.1 +2 -2 xc/xc/lib/GL/mesa/src/drv/tdfx/tdfx_vb.c 1.37.6.1 +21 -1 xc/xc/programs/Xserver/GL/dri/dri.c 1.18.16.1 +3 -0 xc/xc/programs/Xserver/GL/dri/dri.h 1.18.6.1 +2 -0 xc/xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h 1.7.6.1 +1 -0 xc/xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile 1.19.6.2 +4 -4 xc/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.h 1.2.2.2 +87 -0 xc/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_common.h 1.21.6.2 +233 -105 xc/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c 1.5.16.2 +0 -3 xc/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.h 1.4.16.2 +0 -5 xc/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dripriv.h 1.19.6.2 +43 -2 xc/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 1.13.6.1 +222 -30 xc/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h 1.5.6.1 +2 -23 xc/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_sarea.h 1.15.6.1 +2 -2 xc/xc/programs/Xserver/hw/xfree86/drivers/i810/Imakefile 1.21.6.1 +8 -5 xc/xc/programs/Xserver/hw/xfree86/drivers/i810/i810.h 1.6.6.1 +33 -5 xc/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_cursor.c 1.31.6.2 +8 -4 xc/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c 1.3.70.1 +21 -11 xc/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_io.c 1.19.6.1 +4 -4 xc/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_memory.c 1.2.2.2 +32 -0 xc/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_common.h 1.1.1.1.6.1 +288 -155 xc/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c 1.20.12.2 +10 -0 xc/xc/programs/Xserver/hw/xfree86/os-support/xf86drm.h 1.1.1.1.6.4 +24 -0 xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_memory.h 1.5.14.1 +1 -0 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Imakefile 1.35.6.2 +4 -0 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm.h 1.2.6.3 +2 -4 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i830_dma.c 1.25.12.1 +10 -39 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_drv.h 1.20.6.2 +23 -145 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/radeon_cp.c 1.9.6.2 +110 -13 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/radeon_drm.h 1.13.6.2 +11 -14 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/radeon_drv.c 1.13.6.1 +86 -57 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/radeon_drv.h 1.12.6.2 +709 -503 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/radeon_state.c |