CVS Update: xc (branch: trunk)

[Eric Anholt]

CVSROOT:	/cvs/xorg
Module name:	xc
Changes by:	anholt at pdx.	04/06/16 02:38:00

Log message:
  Merge DRI-trunk-20040613 changes in programs/Xserver/GL.

Modified files:
      xc/programs/Xserver/GL/:
        Imakefile glxmodule.c 
      xc/programs/Xserver/GL/dri/:
        Imakefile dri.c dri.h dristruct.h sarea.h xf86dri.c 
      xc/programs/Xserver/GL/glx/:
        Imakefile g_disptab.c g_disptab.h g_render.c 
        g_renderswap.c glx-def.cpp glxcmds.c glxcmdsswap.c 
        glxcontext.h glxdrawable.h glxext.h glxscreens.c 
        glxscreens.h glxutil.c glxutil.h render2.c rensize.c 
        single2.c singlesize.c 
      xc/programs/Xserver/GL/mesa/:
        Imakefile 
      xc/programs/Xserver/GL/mesa/GLcore/:
        Imakefile 
      xc/programs/Xserver/GL/mesa/GLcore/module/:
        Imakefile 
Removed files:
      xc/programs/Xserver/GL/mesa/src/:
        Imakefile 
      xc/programs/Xserver/GL/mesa/src/X/:
        Imakefile xf86glx.c xf86glx_util.c xf86glx_util.h 
        xf86glxint.h 
      xc/programs/Xserver/GL/mesa/src/X/module/:
        Imakefile 
      xc/programs/Xserver/GL/mesa/src/array_cache/:
        Imakefile 
      xc/programs/Xserver/GL/mesa/src/array_cache/module/:
        Imakefile 
      xc/programs/Xserver/GL/mesa/src/math/:
        Imakefile 
      xc/programs/Xserver/GL/mesa/src/math/module/:
        Imakefile 
      xc/programs/Xserver/GL/mesa/src/module/:
        Imakefile 
      xc/programs/Xserver/GL/mesa/src/swrast/:
        Imakefile 
      xc/programs/Xserver/GL/mesa/src/swrast/module/:
        Imakefile 
      xc/programs/Xserver/GL/mesa/src/swrast_setup/:
        Imakefile 
      xc/programs/Xserver/GL/mesa/src/swrast_setup/module/:
        Imakefile 
      xc/programs/Xserver/GL/mesa/src/tnl/:
        Imakefile 
      xc/programs/Xserver/GL/mesa/src/tnl/module/:
        Imakefile 
  
  Revision      Changes    Path
  1.4           +1 -1      xc/programs/Xserver/GL/Imakefile
  1.3           +0 -1      xc/programs/Xserver/GL/glxmodule.c
  1.3           +4 -3      xc/programs/Xserver/GL/dri/Imakefile
  1.3           +107 -30   xc/programs/Xserver/GL/dri/dri.c
  1.3           +14 -12    xc/programs/Xserver/GL/dri/dri.h
  1.3           +7 -7      xc/programs/Xserver/GL/dri/dristruct.h
  1.3           +1 -1      xc/programs/Xserver/GL/dri/sarea.h
  1.3           +10 -10    xc/programs/Xserver/GL/dri/xf86dri.c
  1.3           +5 -2      xc/programs/Xserver/GL/glx/Imakefile
  1.3           +20 -20    xc/programs/Xserver/GL/glx/g_disptab.c
  1.3           +6 -0      xc/programs/Xserver/GL/glx/g_disptab.h
  1.3           +0 -1      xc/programs/Xserver/GL/glx/g_render.c
  1.3           +0 -1      xc/programs/Xserver/GL/glx/g_renderswap.c
  1.3           +0 -1      xc/programs/Xserver/GL/glx/glx-def.cpp
  1.3           +275 -97   xc/programs/Xserver/GL/glx/glxcmds.c
  1.3           +104 -84   xc/programs/Xserver/GL/glx/glxcmdsswap.c
  1.3           +0 -1      xc/programs/Xserver/GL/glx/glxcontext.h
  1.3           +3 -2      xc/programs/Xserver/GL/glx/glxdrawable.h
  1.3           +10 -2     xc/programs/Xserver/GL/glx/glxext.h
  1.3           +2 -82     xc/programs/Xserver/GL/glx/glxscreens.c
  1.3           +5 -1      xc/programs/Xserver/GL/glx/glxscreens.h
  1.3           +5 -57     xc/programs/Xserver/GL/glx/glxutil.c
  1.3           +0 -1      xc/programs/Xserver/GL/glx/glxutil.h
  1.3           +3 -5      xc/programs/Xserver/GL/glx/render2.c
  1.3           +1 -1      xc/programs/Xserver/GL/glx/rensize.c
  1.3           +1 -1      xc/programs/Xserver/GL/glx/single2.c
  1.3           +50 -7     xc/programs/Xserver/GL/glx/singlesize.c
  1.3           +38 -5     xc/programs/Xserver/GL/mesa/Imakefile
  1.3           +23 -20    xc/programs/Xserver/GL/mesa/GLcore/Imakefile
  1.3           +21 -21    xc/programs/Xserver/GL/mesa/GLcore/module/Imakefile