CVSROOT: /home/x-cvs Module name: xc Changes by: [EMAIL PROTECTED] 04/04/22 06:58:41
Log message: Re-implement changes clobbered by Mesa 6 merge. Build & warning fixes. Modified files: xc/extras/Mesa/include/GL/: glxext.h xc/extras/Mesa/src/mesa/drivers/dri/common/: texmem.c utils.c vblank.h xc/extras/Mesa/src/mesa/drivers/dri/ffb/: ffb_vbtmp.h xc/extras/Mesa/src/mesa/drivers/dri/i810/: i810texmem.c xc/extras/Mesa/src/mesa/drivers/dri/i830/: i830_texmem.c xc/extras/Mesa/src/mesa/drivers/dri/mga/: mgacontext.h mgaioctl.c mgatexmem.c mgavb.c xc/extras/Mesa/src/mesa/drivers/dri/r128/: r128_ioctl.c r128_tex.c r128_texmem.c r128_texstate.c xc/extras/Mesa/src/mesa/drivers/dri/r200/: r200_context.h r200_screen.c r200_vtxtmp_x86.S xc/extras/Mesa/src/mesa/drivers/dri/radeon/: radeon_context.c radeon_context.h radeon_ioctl.c radeon_screen.c radeon_tex.c radeon_texmem.c radeon_texstate.c radeon_vtxfmt.c radeon_vtxtmp_x86.S xc/extras/Mesa/src/mesa/drivers/dri/sis/: sis_alloc.c xc/extras/Mesa/src/mesa/drivers/dri/tdfx/: tdfx_screen.c tdfx_span.c tdfx_texman.c xc/extras/Mesa/src/mesa/drivers/x11/: xm_api.c xc/extras/Mesa/src/mesa/glapi/: glapitemp.h xc/extras/Mesa/src/mesa/main/: imports.h texstore.c xc/extras/Mesa/src/mesa/math/: m_xform.c xc/extras/Mesa/src/mesa/sparc/: clip.S norm.S xform.S xc/extras/Mesa/src/mesa/tnl/: t_save_api.c t_vb_lighttmp.h xc/extras/Mesa/src/mesa/x86/: 3dnow_normal.S 3dnow_xform1.S 3dnow_xform2.S 3dnow_xform3.S 3dnow_xform4.S assyntax.h common_x86.c common_x86_asm.h mmx_blend.S sse_normal.S sse_xform1.S sse_xform2.S sse_xform3.S sse_xform4.S xc/lib/GL/dri/: dri_util.h xf86dri.h xc/lib/GL/glx/: glxclient.h glxcmds.c glxext.c glxextensions.c packrender.h packsingle.h packvendpriv.h single2.c xc/lib/GL/mesa/: Imakefile.inc xc/lib/GL/mesa/array_cache/: Imakefile.inc 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/math/: Imakefile.inc xc/lib/GL/mesa/sparc/: Imakefile Imakefile.inc xc/lib/GL/mesa/swrast/: Imakefile.inc xc/lib/GL/mesa/swrast_setup/: Imakefile.inc xc/lib/GL/mesa/tnl/: 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/: xf86glx.c Revision Changes Path 1.9 +10 -9 xc/extras/Mesa/include/GL/glxext.h 1.2 +2 -2 xc/extras/Mesa/src/mesa/drivers/dri/common/texmem.c 1.2 +3 -2 xc/extras/Mesa/src/mesa/drivers/dri/common/utils.c 1.2 +5 -1 xc/extras/Mesa/src/mesa/drivers/dri/common/vblank.h 1.2 +3 -1 xc/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_vbtmp.h 1.2 +6 -0 xc/extras/Mesa/src/mesa/drivers/dri/i810/i810texmem.c 1.2 +6 -2 xc/extras/Mesa/src/mesa/drivers/dri/i830/i830_texmem.c 1.2 +3 -4 xc/extras/Mesa/src/mesa/drivers/dri/mga/mgacontext.h 1.2 +2 -2 xc/extras/Mesa/src/mesa/drivers/dri/mga/mgaioctl.c 1.2 +2 -2 xc/extras/Mesa/src/mesa/drivers/dri/mga/mgatexmem.c 1.2 +3 -3 xc/extras/Mesa/src/mesa/drivers/dri/mga/mgavb.c 1.2 +4 -3 xc/extras/Mesa/src/mesa/drivers/dri/r128/r128_ioctl.c 1.2 +4 -3 xc/extras/Mesa/src/mesa/drivers/dri/r128/r128_tex.c 1.2 +2 -2 xc/extras/Mesa/src/mesa/drivers/dri/r128/r128_texmem.c 1.2 +3 -3 xc/extras/Mesa/src/mesa/drivers/dri/r128/r128_texstate.c 1.2 +3 -4 xc/extras/Mesa/src/mesa/drivers/dri/r200/r200_context.h 1.2 +19 -4 xc/extras/Mesa/src/mesa/drivers/dri/r200/r200_screen.c 1.2 +3 -1 xc/extras/Mesa/src/mesa/drivers/dri/r200/r200_vtxtmp_x86.S 1.2 +4 -4 xc/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_context.c 1.2 +3 -4 xc/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_context.h 1.2 +3 -6 xc/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_ioctl.c 1.2 +14 -1 xc/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_screen.c 1.2 +4 -4 xc/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_tex.c 1.2 +4 -4 xc/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_texmem.c 1.2 +2 -2 xc/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_texstate.c 1.2 +2 -2 xc/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_vtxfmt.c 1.2 +3 -1 xc/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_vtxtmp_x86.S 1.2 +3 -3 xc/extras/Mesa/src/mesa/drivers/dri/sis/sis_alloc.c 1.2 +3 -3 xc/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_screen.c 1.2 +12 -11 xc/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_span.c 1.2 +2 -2 xc/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_texman.c 1.2 +4 -1 xc/extras/Mesa/src/mesa/drivers/x11/xm_api.c 1.2 +13 -3 xc/extras/Mesa/src/mesa/glapi/glapitemp.h 1.3 +4 -2 xc/extras/Mesa/src/mesa/main/imports.h 1.2 +2 -3 xc/extras/Mesa/src/mesa/main/texstore.c 1.2 +2 -1 xc/extras/Mesa/src/mesa/math/m_xform.c 1.2 +9 -0 xc/extras/Mesa/src/mesa/sparc/clip.S 1.2 +7 -0 xc/extras/Mesa/src/mesa/sparc/norm.S 1.2 +7 -0 xc/extras/Mesa/src/mesa/sparc/xform.S 1.2 +19 -17 xc/extras/Mesa/src/mesa/tnl/t_save_api.c 1.2 +27 -20 xc/extras/Mesa/src/mesa/tnl/t_vb_lighttmp.h 1.2 +23 -18 xc/extras/Mesa/src/mesa/x86/3dnow_normal.S 1.2 +4 -0 xc/extras/Mesa/src/mesa/x86/3dnow_xform1.S 1.2 +3 -0 xc/extras/Mesa/src/mesa/x86/3dnow_xform2.S 1.2 +3 -0 xc/extras/Mesa/src/mesa/x86/3dnow_xform3.S 1.2 +3 -0 xc/extras/Mesa/src/mesa/x86/3dnow_xform4.S 1.2 +22 -3 xc/extras/Mesa/src/mesa/x86/assyntax.h 1.2 +11 -12 xc/extras/Mesa/src/mesa/x86/common_x86.c 1.2 +2 -1 xc/extras/Mesa/src/mesa/x86/common_x86_asm.h 1.2 +5 -1 xc/extras/Mesa/src/mesa/x86/mmx_blend.S 1.2 +3 -0 xc/extras/Mesa/src/mesa/x86/sse_normal.S 1.2 +3 -0 xc/extras/Mesa/src/mesa/x86/sse_xform1.S 1.2 +3 -0 xc/extras/Mesa/src/mesa/x86/sse_xform2.S 1.2 +3 -0 xc/extras/Mesa/src/mesa/x86/sse_xform3.S 1.2 +3 -0 xc/extras/Mesa/src/mesa/x86/sse_xform4.S 1.6 +1 -3 xc/lib/GL/dri/dri_util.h 1.11 +1 -31 xc/lib/GL/dri/xf86dri.h 1.24 +2 -1 xc/lib/GL/glx/glxclient.h 1.33 +7 -7 xc/lib/GL/glx/glxcmds.c 1.26 +95 -4 xc/lib/GL/glx/glxext.c 1.4 +5 -5 xc/lib/GL/glx/glxextensions.c 1.10 +5 -4 xc/lib/GL/glx/packrender.h 1.8 +11 -10 xc/lib/GL/glx/packsingle.h 1.8 +5 -4 xc/lib/GL/glx/packvendpriv.h 1.14 +7 -6 xc/lib/GL/glx/single2.c 1.2 +8 -1 xc/lib/GL/mesa/Imakefile.inc 1.2 +4 -1 xc/lib/GL/mesa/array_cache/Imakefile.inc 1.3 +2 -2 xc/lib/GL/mesa/drivers/dri/common/Imakefile 1.2 +7 -1 xc/lib/GL/mesa/drivers/dri/common/Imakefile.inc 1.3 +4 -4 xc/lib/GL/mesa/drivers/dri/ffb/Imakefile 1.2 +17 -2 xc/lib/GL/mesa/drivers/dri/ffb/Imakefile.inc 1.3 +4 -4 xc/lib/GL/mesa/drivers/dri/gamma/Imakefile 1.2 +17 -2 xc/lib/GL/mesa/drivers/dri/gamma/Imakefile.inc 1.3 +4 -4 xc/lib/GL/mesa/drivers/dri/i810/Imakefile 1.2 +14 -2 xc/lib/GL/mesa/drivers/dri/i810/Imakefile.inc 1.3 +4 -4 xc/lib/GL/mesa/drivers/dri/i830/Imakefile 1.2 +14 -2 xc/lib/GL/mesa/drivers/dri/i830/Imakefile.inc 1.3 +4 -4 xc/lib/GL/mesa/drivers/dri/mga/Imakefile 1.2 +16 -2 xc/lib/GL/mesa/drivers/dri/mga/Imakefile.inc 1.3 +4 -4 xc/lib/GL/mesa/drivers/dri/r128/Imakefile 1.2 +15 -2 xc/lib/GL/mesa/drivers/dri/r128/Imakefile.inc 1.3 +8 -4 xc/lib/GL/mesa/drivers/dri/r200/Imakefile 1.2 +27 -2 xc/lib/GL/mesa/drivers/dri/r200/Imakefile.inc 1.3 +8 -4 xc/lib/GL/mesa/drivers/dri/radeon/Imakefile 1.2 +26 -2 xc/lib/GL/mesa/drivers/dri/radeon/Imakefile.inc 1.3 +4 -4 xc/lib/GL/mesa/drivers/dri/sis/Imakefile 1.2 +18 -1 xc/lib/GL/mesa/drivers/dri/sis/Imakefile.inc 1.3 +4 -4 xc/lib/GL/mesa/drivers/dri/tdfx/Imakefile 1.2 +16 -2 xc/lib/GL/mesa/drivers/dri/tdfx/Imakefile.inc 1.4 +19 -4 xc/lib/GL/mesa/drivers/osmesa/Imakefile 1.3 +2 -2 xc/lib/GL/mesa/drivers/x11/Imakefile 1.2 +15 -1 xc/lib/GL/mesa/drivers/x11/Imakefile.inc 1.2 +10 -1 xc/lib/GL/mesa/math/Imakefile.inc 1.2 +3 -2 xc/lib/GL/mesa/sparc/Imakefile 1.2 +8 -1 xc/lib/GL/mesa/sparc/Imakefile.inc 1.2 +30 -1 xc/lib/GL/mesa/swrast/Imakefile.inc 1.2 +4 -1 xc/lib/GL/mesa/swrast_setup/Imakefile.inc 1.2 +22 -1 xc/lib/GL/mesa/tnl/Imakefile.inc 1.2 +4 -1 xc/lib/GL/mesa/tnl_dd/Imakefile 1.2 +4 -1 xc/lib/GL/mesa/tnl_dd/Imakefile.inc 1.2 +7 -3 xc/lib/GL/mesa/x86/Imakefile 1.2 +27 -1 xc/lib/GL/mesa/x86/Imakefile.inc 1.2 +1 -6 xc/programs/Xserver/GL/mesa/X/xf86glx.c _______________________________________________ Cvs-commit mailing list [EMAIL PROTECTED] http://XFree86.Org/mailman/listinfo/cvs-commit