CVSROOT:        /home/x-cvs
Module name:    xc
Changes by:     [EMAIL PROTECTED]       04/04/08 03:08:02

Log message:
  Complete Mesa 6.0.1 (20040408) merge

Modified files:
      xc/programs/Xserver/hw/xfree86/drivers/i810/:
        Imakefile 
      xc/include/GL/:
        Imakefile glxproto.h glxtokens.h 
      xc/lib/GL/:
        Imakefile 
      xc/lib/GL/GL/:
        Imakefile 
      xc/lib/GL/dri/:
        Imakefile dri_glx.c dri_util.c dri_util.h xf86dri.h 
      xc/lib/GL/glx/:
        Imakefile clientattrib.c compsize.c g_render.c 
        glcontextmodes.c glcontextmodes.h glxclient.h glxcmds.c 
        glxext.c glxextensions.c glxextensions.h indirect.h 
        indirect_init.c indirect_wrap.h packrender.h packsingle.h 
        packvendpriv.h pixel.c pixelstore.c render2.c renderpix.c 
        single2.c singlepix.c size.h vertarr.c 
      xc/programs/Xserver/GL/dri/:
        Imakefile 
      xc/programs/Xserver/GL/mesa/:
        Imakefile 
      xc/programs/Xserver/GL/mesa/GLcore/:
        Imakefile 
Added files:
      xc/lib/GL/mesa/:
        Imakefile Imakefile.inc 
      xc/lib/GL/mesa/array_cache/:
        Imakefile Imakefile.inc 
      xc/lib/GL/mesa/drivers/dri/:
        Imakefile 
      xc/lib/GL/mesa/drivers/dri/common/:
        Imakefile Imakefile.inc 
      xc/lib/GL/mesa/drivers/dri/ffb/:
        Imakefile Imakefile.inc 
      xc/lib/GL/mesa/drivers/dri/gamma/:
        Imakefile Imakefile.inc 
      xc/lib/GL/mesa/drivers/dri/i810/:
        Imakefile Imakefile.inc 
      xc/lib/GL/mesa/drivers/dri/i830/:
        Imakefile Imakefile.inc 
      xc/lib/GL/mesa/drivers/dri/mga/:
        Imakefile Imakefile.inc 
      xc/lib/GL/mesa/drivers/dri/r128/:
        Imakefile Imakefile.inc 
      xc/lib/GL/mesa/drivers/dri/r200/:
        Imakefile Imakefile.inc 
      xc/lib/GL/mesa/drivers/dri/radeon/:
        Imakefile Imakefile.inc 
      xc/lib/GL/mesa/drivers/dri/sis/:
        Imakefile Imakefile.inc 
      xc/lib/GL/mesa/drivers/dri/tdfx/:
        Imakefile Imakefile.inc 
      xc/lib/GL/mesa/drivers/osmesa/:
        Imakefile 
      xc/lib/GL/mesa/drivers/x11/:
        Imakefile Imakefile.inc 
      xc/lib/GL/mesa/main/:
        Imakefile Imakefile.inc 
      xc/lib/GL/mesa/math/:
        Imakefile Imakefile.inc 
      xc/lib/GL/mesa/sparc/:
        Imakefile Imakefile.inc 
      xc/lib/GL/mesa/swrast/:
        Imakefile Imakefile.inc 
      xc/lib/GL/mesa/swrast_setup/:
        Imakefile Imakefile.inc 
      xc/lib/GL/mesa/tnl/:
        Imakefile Imakefile.inc 
      xc/lib/GL/mesa/tnl_dd/:
        Imakefile Imakefile.inc 
      xc/lib/GL/mesa/x86/:
        Imakefile Imakefile.inc 
      xc/programs/Xserver/GL/mesa/X/:
        Imakefile xf86glx.c xf86glx_util.c xf86glx_util.h 
        xf86glxint.h 
      xc/programs/Xserver/GL/mesa/X/module/:
        Imakefile 
      xc/programs/Xserver/GL/mesa/array_cache/:
        Imakefile 
      xc/programs/Xserver/GL/mesa/array_cache/module/:
        Imakefile 
      xc/programs/Xserver/GL/mesa/main/:
        Imakefile 
      xc/programs/Xserver/GL/mesa/main/module/:
        Imakefile 
      xc/programs/Xserver/GL/mesa/math/:
        Imakefile 
      xc/programs/Xserver/GL/mesa/math/module/:
        Imakefile 
      xc/programs/Xserver/GL/mesa/swrast/:
        Imakefile 
      xc/programs/Xserver/GL/mesa/swrast/module/:
        Imakefile 
      xc/programs/Xserver/GL/mesa/swrast_setup/:
        Imakefile 
      xc/programs/Xserver/GL/mesa/swrast_setup/module/:
        Imakefile 
      xc/programs/Xserver/GL/mesa/tnl/:
        Imakefile 
      xc/programs/Xserver/GL/mesa/tnl/module/:
        Imakefile 
Removed files:
      xc/lib/GL/include/GL/internal/:
        glcore.h 
      xc/lib/GL/mesa/src/:
        Imakefile Imakefile.inc 
      xc/lib/GL/mesa/src/OSmesa/:
        Imakefile OSMesa-def.cpp 
      xc/lib/GL/mesa/src/SPARC/:
        Imakefile Imakefile.inc 
      xc/lib/GL/mesa/src/X/:
        Imakefile Imakefile.inc 
      xc/lib/GL/mesa/src/X86/:
        Imakefile Imakefile.inc 
      xc/lib/GL/mesa/src/array_cache/:
        Imakefile Imakefile.inc 
      xc/lib/GL/mesa/src/drv/:
        Imakefile 
      xc/lib/GL/mesa/src/drv/common/:
        Imakefile Imakefile.inc depthtmp.h hwlog.c hwlog.h mm.c 
        mm.h mmx.h spantmp.h stenciltmp.h texmem.c texmem.h 
        utils.c utils.h vblank.c vblank.h 
      xc/lib/GL/mesa/src/drv/ffb/:
        Imakefile Imakefile.inc ffb_bitmap.c ffb_bitmap.h 
        ffb_clear.c ffb_clear.h ffb_context.h ffb_dd.c ffb_dd.h 
        ffb_depth.c ffb_depth.h ffb_fifo.h ffb_fog.c ffb_lines.c 
        ffb_lines.h ffb_linetmp.h ffb_lock.h ffb_points.c 
        ffb_points.h ffb_pointtmp.h ffb_rendertmp.h ffb_span.c 
        ffb_span.h ffb_state.c ffb_state.h ffb_stencil.c 
        ffb_stencil.h ffb_tex.c ffb_tex.h ffb_tris.c ffb_tris.h 
        ffb_tritmp.h ffb_vb.c ffb_vb.h ffb_vbtmp.h ffb_vtxfmt.c 
        ffb_vtxfmt.h ffb_xmesa.c ffb_xmesa.h 
      xc/lib/GL/mesa/src/drv/gamma/:
        Imakefile Imakefile.inc gamma_client.h gamma_context.c 
        gamma_context.h gamma_dd.c gamma_inithw.c gamma_lock.c 
        gamma_lock.h gamma_macros.h gamma_regs.h gamma_render.c 
        gamma_screen.c gamma_screen.h gamma_span.c gamma_state.c 
        gamma_tex.c gamma_texmem.c gamma_texstate.c gamma_tris.c 
        gamma_tris.h gamma_tritmp.h gamma_vb.c gamma_vb.h 
        gamma_xmesa.c 
      xc/lib/GL/mesa/src/drv/i810/:
        Imakefile Imakefile.inc i810_3d_reg.h i810context.c 
        i810context.h i810ioctl.c i810ioctl.h i810render.c 
        i810screen.c i810screen.h i810span.c i810span.h 
        i810state.c i810state.h i810tex.c i810tex.h i810texmem.c 
        i810texstate.c i810tris.c i810tris.h i810vb.c i810vb.h 
      xc/lib/GL/mesa/src/drv/i830/:
        Imakefile Imakefile.inc i830_3d_reg.h i830_context.c 
        i830_context.h i830_debug.c i830_debug.h i830_ioctl.c 
        i830_ioctl.h i830_render.c i830_screen.c i830_screen.h 
        i830_span.c i830_span.h i830_state.c i830_state.h 
        i830_tex.c i830_tex.h i830_texmem.c i830_texstate.c 
        i830_tris.c i830_tris.h i830_vb.c i830_vb.h 
      xc/lib/GL/mesa/src/drv/mga/:
        Imakefile Imakefile.inc mga_texcombine.c mga_texstate.c 
        mga_xmesa.c mga_xmesa.h mgacontext.h mgadd.c mgadd.h 
        mgaioctl.c mgaioctl.h mgapixel.c mgapixel.h mgaregs.h 
        mgarender.c mgaspan.c mgaspan.h mgastate.c mgastate.h 
        mgatex.c mgatex.h mgatexmem.c mgatris.c mgatris.h mgavb.c 
        mgavb.h 
      xc/lib/GL/mesa/src/drv/r128/:
        Imakefile Imakefile.inc r128_context.c r128_context.h 
        r128_dd.c r128_dd.h r128_ioctl.c r128_ioctl.h r128_lock.c 
        r128_lock.h r128_screen.c r128_screen.h r128_span.c 
        r128_span.h r128_state.c r128_state.h r128_tex.c 
        r128_tex.h r128_texmem.c r128_texobj.h r128_texstate.c 
        r128_tris.c r128_tris.h r128_vb.c r128_vb.h 
      xc/lib/GL/mesa/src/drv/r200/:
        Imakefile Imakefile.inc r200_cmdbuf.c r200_context.c 
        r200_context.h r200_ioctl.c r200_ioctl.h r200_lock.c 
        r200_lock.h r200_maos.c r200_maos.h r200_maos_arrays.c 
        r200_maos_vbtmp.h r200_maos_verts.c r200_pixel.c 
        r200_pixel.h r200_reg.h r200_sanity.c r200_sanity.h 
        r200_screen.c r200_screen.h r200_span.c r200_span.h 
        r200_state.c r200_state.h r200_state_init.c r200_swtcl.c 
        r200_swtcl.h r200_tcl.c r200_tcl.h r200_tex.c r200_tex.h 
        r200_texmem.c r200_texstate.c r200_vtxfmt.c r200_vtxfmt.h 
        r200_vtxfmt_c.c r200_vtxfmt_sse.c r200_vtxfmt_x86.c 
        r200_vtxtmp_x86.S 
      xc/lib/GL/mesa/src/drv/radeon/:
        Imakefile Imakefile.inc radeon_context.c radeon_context.h 
        radeon_ioctl.c radeon_ioctl.h radeon_lock.c radeon_lock.h 
        radeon_maos.c radeon_maos.h radeon_maos_arrays.c 
        radeon_maos_vbtmp.h radeon_maos_verts.c radeon_sanity.c 
        radeon_sanity.h radeon_screen.c radeon_screen.h 
        radeon_span.c radeon_span.h radeon_state.c radeon_state.h 
        radeon_state_init.c radeon_swtcl.c radeon_swtcl.h 
        radeon_tcl.c radeon_tcl.h radeon_tex.c radeon_tex.h 
        radeon_texmem.c radeon_texstate.c radeon_vtxfmt.c 
        radeon_vtxfmt.h radeon_vtxfmt_c.c radeon_vtxfmt_sse.c 
        radeon_vtxfmt_x86.c radeon_vtxtmp_x86.S 
      xc/lib/GL/mesa/src/drv/sis/:
        Imakefile Imakefile.inc sis_alloc.c sis_alloc.h 
        sis_clear.c sis_common2.h sis_context.c sis_context.h 
        sis_dd.c sis_dd.h sis_debug.c sis_debug.h sis_fog.c 
        sis_lock.c sis_lock.h sis_reg.h sis_screen.c sis_screen.h 
        sis_span.c sis_span.h sis_state.c sis_state.h 
        sis_stencil.c sis_stencil.h sis_tex.c sis_tex.h 
        sis_texstate.c sis_tris.c sis_tris.h sis_tritmp.h 
        sis_vb.c sis_vb.h 
      xc/lib/GL/mesa/src/drv/tdfx/:
        BUGS Imakefile Imakefile.inc dri_glide.h tdfx_context.c 
        tdfx_context.h tdfx_dd.c tdfx_dd.h tdfx_glide.h 
        tdfx_lock.c tdfx_lock.h tdfx_pixels.c tdfx_pixels.h 
        tdfx_render.c tdfx_render.h tdfx_screen.c tdfx_screen.h 
        tdfx_span.c tdfx_span.h tdfx_state.c tdfx_state.h 
        tdfx_tex.c tdfx_tex.h tdfx_texman.c tdfx_texman.h 
        tdfx_texstate.c tdfx_texstate.h tdfx_tris.c tdfx_tris.h 
        tdfx_vb.c tdfx_vb.h tdfx_vbtmp.h 
      xc/lib/GL/mesa/src/drv/tdfx/X86/:
        fx_3dnow_fastpath.S fx_3dnow_fasttmp.h 
      xc/lib/GL/mesa/src/math/:
        Imakefile Imakefile.inc 
      xc/lib/GL/mesa/src/swrast/:
        Imakefile Imakefile.inc 
      xc/lib/GL/mesa/src/swrast_setup/:
        Imakefile Imakefile.inc 
      xc/lib/GL/mesa/src/tnl/:
        Imakefile Imakefile.inc 
      xc/lib/GL/mesa/src/tnl_dd/:
        Imakefile Imakefile.inc 
  
  Revision      Changes    Path
  1.30          +2 -2      xc/programs/Xserver/hw/xfree86/drivers/i810/Imakefile
  1.15          +5 -5      xc/include/GL/Imakefile
  1.8           +7 -1      xc/include/GL/glxproto.h
  1.7           +7 -1      xc/include/GL/glxtokens.h
  1.45          +4 -4      xc/lib/GL/Imakefile
  1.27          +15 -15    xc/lib/GL/GL/Imakefile
  1.14          +9 -5      xc/lib/GL/dri/Imakefile
  1.16          +45 -1     xc/lib/GL/dri/dri_glx.c
  1.12          +196 -209  xc/lib/GL/dri/dri_util.c
  1.5           +6 -9      xc/lib/GL/dri/dri_util.h
  1.10          +30 -0     xc/lib/GL/dri/xf86dri.h
  1.27          +16 -16    xc/lib/GL/glx/Imakefile
  1.7           +18 -18    xc/lib/GL/glx/clientattrib.c
  1.8           +6 -2      xc/lib/GL/glx/compsize.c
  1.10          +434 -3409 xc/lib/GL/glx/g_render.c
  1.4           +112 -12   xc/lib/GL/glx/glcontextmodes.c
  1.4           +4 -2      xc/lib/GL/glx/glcontextmodes.h
  1.23          +480 -337  xc/lib/GL/glx/glxclient.h
  1.32          +216 -72   xc/lib/GL/glx/glxcmds.c
  1.24          +83 -150   xc/lib/GL/glx/glxext.c
  1.3           +15 -10    xc/lib/GL/glx/glxextensions.c
  1.4           +4 -3      xc/lib/GL/glx/glxextensions.h
  1.7           +424 -327  xc/lib/GL/glx/indirect.h
  1.11          +1 -1      xc/lib/GL/glx/indirect_init.c
  1.6           +1 -1      xc/lib/GL/glx/indirect_wrap.h
  1.9           +4 -5      xc/lib/GL/glx/packrender.h
  1.7           +5 -6      xc/lib/GL/glx/packsingle.h
  1.7           +4 -5      xc/lib/GL/glx/packvendpriv.h
  1.10          +1 -1      xc/lib/GL/glx/pixel.c
  1.6           +2 -2      xc/lib/GL/glx/pixelstore.c
  1.8           +3 -3      xc/lib/GL/glx/render2.c
  1.7           +1 -1      xc/lib/GL/glx/renderpix.c
  1.12          +109 -237  xc/lib/GL/glx/single2.c
  1.5           +0 -0      xc/lib/GL/glx/singlepix.c
  1.6           +1 -1      xc/lib/GL/glx/size.h
  1.6           +448 -227  xc/lib/GL/glx/vertarr.c
  1.9           +2 -2      xc/programs/Xserver/GL/dri/Imakefile
  1.7           +38 -5     xc/programs/Xserver/GL/mesa/Imakefile
  1.6           +22 -21    xc/programs/Xserver/GL/mesa/GLcore/Imakefile

_______________________________________________
Cvs-commit mailing list
[EMAIL PROTECTED]
http://XFree86.Org/mailman/listinfo/cvs-commit

Reply via email to