CVS Update: xc (branch: trunk)

[Adam Jackson]

CVSROOT:	/cvs/xorg
Module name:	xc
Changes by:	ajax at gabe.freedesktop.org	05/07/31 10:01:51

Log message:
  Conflict resolve from Mesa 6.3.1 import.

Modified files:
      xc/extras/Mesa/include/GL/:
        gl.h glxext.h 
      xc/extras/Mesa/src/mesa/drivers/dri/common/:
        dri_util.c 
      xc/extras/Mesa/src/mesa/drivers/dri/i915/:
        i830_context.c i830_state.c i915_context.c 
        i915_fragprog.c i915_metaops.c i915_state.c 
        i915_texstate.c i915_vtbl.c intel_context.c 
        intel_context.h intel_ioctl.c intel_screen.c 
        intel_state.c intel_tex.c intel_tris.c 
      xc/extras/Mesa/src/mesa/drivers/dri/r200/:
        r200_tcl.c 
      xc/extras/Mesa/src/mesa/drivers/dri/radeon/:
        radeon_swtcl.c radeon_tcl.c 
      xc/extras/Mesa/src/mesa/main/:
        imports.h 
Removed files:
      xc/extras/Mesa/:
        Mesa.dsw 
      xc/extras/Mesa/docs/:
        INSTALL.GNU 
      xc/extras/Mesa/src/mesa/array_cache/:
        array_cache.dsp 
      xc/extras/Mesa/src/mesa/drivers/dri/r128/:
        r128_vb.h 
      xc/extras/Mesa/src/mesa/drivers/dri/radeon/:
        radeon_subset.h radeon_subset_bitmap.c 
        radeon_subset_readpix.c radeon_subset_select.c 
        radeon_subset_tex.c radeon_subset_vtx.c 
      xc/extras/Mesa/src/mesa/drivers/dri/savage/:
        savagedma.c savagedma.h 
      xc/extras/Mesa/src/mesa/drivers/dri/unichrome/:
        via_dd_tritmp.h via_dd_vbtmp.h via_dmatmp.h via_texmem.c 
        via_texstate.c via_vb.c via_vb.h via_vb_cliptmp.h 
        via_vb_rendertmp.h xf86drmVIA.c xf86drmVIA.h 
      xc/extras/Mesa/src/mesa/drivers/glide/:
        fx.rc fxopengl.def fxwgl.c 
      xc/extras/Mesa/src/mesa/drivers/osmesa/:
        osmesa.dsp 
      xc/extras/Mesa/src/mesa/drivers/windows/gdi/:
        gdi.dsp 
      xc/extras/Mesa/src/mesa/glapi/:
        APIspec apiparser.py glapi.dsp glapitemp.py gloffsets.py 
        glprocs.py glsparcasm.py gltable.py glx86asm.py 
      xc/extras/Mesa/src/mesa/main/:
        main.dsp 
      xc/extras/Mesa/src/mesa/math/:
        math.dsp 
      xc/extras/Mesa/src/mesa/shader/:
        grammar.c grammar.h grammar.syn grammar_mesa.c 
        grammar_mesa.h grammar_syn.h shader.dsp 
        slang_common_builtin.gc slang_core.gc 
        slang_fragment_builtin.gc slang_vertex_builtin.gc 
      xc/extras/Mesa/src/mesa/swrast/:
        s_alphabuf.c s_alphabuf.h s_auxbuffer.c s_auxbuffer.h 
        swrast.dsp 
      xc/extras/Mesa/src/mesa/swrast_setup/:
        swrast_setup.dsp 
      xc/extras/Mesa/src/mesa/tnl/:
        t_vertex_c.c t_vertex_codegen.c tnl.dsp 
  
  Revision      Changes    Path
  1.4           +24 -18    xc/extras/Mesa/include/GL/gl.h
  1.4           +18 -8     xc/extras/Mesa/include/GL/glxext.h
  1.4           +63 -697   xc/extras/Mesa/src/mesa/drivers/dri/common/dri_util.c
  1.4           +4 -5      xc/extras/Mesa/src/mesa/drivers/dri/i915/i830_context.c
  1.3           +3 -3      xc/extras/Mesa/src/mesa/drivers/dri/i915/i830_state.c
  1.4           +13 -10    xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_context.c
  1.3           +43 -31    xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_fragprog.c
  1.3           +3 -3      xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_metaops.c
  1.3           +4 -8      xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_state.c
  1.3           +223 -3    xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_texstate.c
  1.4           +2 -1      xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_vtbl.c
  1.4           +89 -59    xc/extras/Mesa/src/mesa/drivers/dri/i915/intel_context.c
  1.5           +7 -1      xc/extras/Mesa/src/mesa/drivers/dri/i915/intel_context.h
  1.3           +16 -16    xc/extras/Mesa/src/mesa/drivers/dri/i915/intel_ioctl.c
  1.3           +122 -68   xc/extras/Mesa/src/mesa/drivers/dri/i915/intel_screen.c
  1.3           +6 -3      xc/extras/Mesa/src/mesa/drivers/dri/i915/intel_state.c
  1.3           +29 -0     xc/extras/Mesa/src/mesa/drivers/dri/i915/intel_tex.c
  1.4           +3 -3      xc/extras/Mesa/src/mesa/drivers/dri/i915/intel_tris.c
  1.3           +132 -100  xc/extras/Mesa/src/mesa/drivers/dri/r200/r200_tcl.c
  1.3           +224 -468  xc/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_swtcl.c
  1.3           +35 -79    xc/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_tcl.c
  1.6           +24 -45    xc/extras/Mesa/src/mesa/main/imports.h