From: Alan H. <al...@us...> - 2001-12-03 14:53:56
|
CVSROOT: /cvsroot/dri Module name: xc Repository: xc/xc/programs/Xserver/GL/mesa/src/X/ Changes by: alanh@usw-pr-cvs1. 01/12/03 06:53:55 Log message: bring Mesa 4.0.1 into DRI tree. revert glcore.h to XFree86 4.1.0 version. Modified files: xc/xc/config/cf/: Tag: mesa-4-0-branch host.def xc/xc/extras/Mesa/include/GL/: Tag: mesa-4-0-branch gl.h glext.h osmesa.h xmesa.h xmesa_x.h xmesa_xf86.h xc/xc/extras/Mesa/src/: Tag: mesa-4-0-branch accum.c accum.h all.h attrib.c attrib.h blend.c blend.h buffers.c buffers.h clip.c clip.h colortab.c colortab.h config.c config.h context.c context.h convolve.c dd.h depth.c depth.h dispatch.c dlist.c dlist.h drawpix.c drawpix.h enable.c enable.h enums.c enums.h eval.c eval.h extensions.c extensions.h feedback.c feedback.h fog.c fog.h get.c get.h glapi.c glapi.h glapioffsets.h glapitable.h glapitemp.h glheader.h glthread.c glthread.h hash.c hash.h highpc.c hint.c hint.h image.c image.h light.c light.h lines.c lines.h lowpc.c macros.h matrix.c matrix.h mem.c mem.h mmath.c mmath.h pixel.c pixel.h points.c points.h polygon.c polygon.h rastpos.c rastpos.h simple_list.h state.c state.h stencil.c stencil.h texformat.c texformat.h teximage.c teximage.h texobj.c texobj.h texstate.c texstate.h texutil.c texutil.h texutil_tmp.h varray.c varray.h xc/xc/extras/Mesa/src/OSmesa/: Tag: mesa-4-0-branch osmesa.c xc/xc/extras/Mesa/src/X/: Tag: mesa-4-0-branch fakeglx.c glxapi.c glxapi.h glxheader.h xfonts.c xfonts.h xmesaP.h xc/xc/extras/Mesa/src/X86/: Tag: mesa-4-0-branch 3dnow.c 3dnow.h 3dnow_vertex.S assyntax.h clip_args.h common_x86.c common_x86_asm.S common_x86_asm.h common_x86_features.h glapi_x86.S mmx.h mmx_blend.S x86.c x86.h x86_cliptest.S x86_vertex.S xform_args.h xc/xc/include/GL/: Tag: mesa-4-0-branch Imakefile xc/xc/lib/GL/dri/: Tag: mesa-4-0-branch Imakefile xc/xc/lib/GL/glx/: Tag: mesa-4-0-branch Imakefile xc/xc/lib/GL/include/GL/internal/: Tag: mesa-4-0-branch glcore.h xc/xc/lib/GL/mesa/src/: Tag: mesa-4-0-branch Imakefile xc/xc/lib/GL/mesa/src/OSmesa/: Tag: mesa-4-0-branch Imakefile xc/xc/lib/GL/mesa/src/X/: Tag: mesa-4-0-branch Imakefile.inc xc/xc/lib/GL/mesa/src/drv/gamma/: Tag: mesa-4-0-branch gamma_state.c xc/xc/programs/Xserver/GL/glx/: Tag: mesa-4-0-branch glxcmds.c xc/xc/programs/Xserver/GL/mesa/src/: Tag: mesa-4-0-branch Imakefile xc/xc/programs/Xserver/GL/mesa/src/X/: Tag: mesa-4-0-branch xf86glx.c xf86glxint.h Added files: xc/xc/extras/Mesa/docs/: Tag: mesa-4-0-branch RELNOTES-4.0 RELNOTES-4.0.1 xc/xc/extras/Mesa/include/GL/: Tag: mesa-4-0-branch glx.h glxext.h xc/xc/extras/Mesa/src/SPARC/: Tag: mesa-4-0-branch clip.S glapi_sparc.S norm.S sparc.c sparc.h sparc_matrix.h xform.S xc/xc/extras/Mesa/src/X/: Tag: mesa-4-0-branch realglx.c realglx.h xm_api.c xm_dd.c xm_line.c xm_span.c xm_tri.c xc/xc/extras/Mesa/src/X86/: Tag: mesa-4-0-branch 3dnow_normal.S 3dnow_xform1.S 3dnow_xform2.S 3dnow_xform3.S 3dnow_xform4.S common_x86_macros.h gen_matypes.c norm_args.h sse.c sse.h sse_normal.S sse_vertex.S sse_xform1.S sse_xform2.S sse_xform3.S sse_xform4.S x86_xform2.S x86_xform3.S x86_xform4.S xc/xc/extras/Mesa/src/array_cache/: Tag: mesa-4-0-branch ac_context.c ac_context.h ac_import.c acache.h xc/xc/extras/Mesa/src/math/: Tag: mesa-4-0-branch m_clip_tmp.h m_copy_tmp.h m_debug.h m_debug_clip.c m_debug_norm.c m_debug_util.h m_debug_vertex.c m_debug_xform.c m_dotprod_tmp.h m_eval.c m_eval.h m_matrix.c m_matrix.h m_norm_tmp.h m_trans_tmp.h m_translate.c m_translate.h m_vector.c m_vector.h m_vertices.c m_vertices.h m_xform.c m_xform.h m_xform_tmp.h mathmod.h xc/xc/extras/Mesa/src/swrast/: Tag: mesa-4-0-branch s_aaline.c s_aaline.h s_aalinetemp.h s_aatriangle.c s_aatriangle.h s_aatritemp.h s_accum.c s_accum.h s_alpha.c s_alpha.h s_alphabuf.c s_alphabuf.h s_bitmap.c s_blend.c s_blend.h s_buffers.c s_context.c s_context.h s_copypix.c s_depth.c s_depth.h s_drawpix.c s_drawpix.h s_feedback.c s_feedback.h s_fog.c s_fog.h s_histogram.c s_histogram.h s_imaging.c s_lines.c s_lines.h s_linetemp.h s_logic.c s_logic.h s_masking.c s_masking.h s_pb.c s_pb.h s_pixeltex.c s_pixeltex.h s_points.c s_points.h s_pointtemp.h s_readpix.c s_scissor.c s_scissor.h s_span.c s_span.h s_stencil.c s_stencil.h s_texstore.c s_texture.c s_texture.h s_triangle.c s_triangle.h s_trispan.h s_tritemp.h s_zoom.c s_zoom.h swrast.h xc/xc/extras/Mesa/src/swrast_setup/: Tag: mesa-4-0-branch ss_context.c ss_context.h ss_triangle.c ss_triangle.h ss_tritmp.h ss_vb.c ss_vb.h ss_vbtmp.h swrast_setup.h xc/xc/extras/Mesa/src/tnl/: Tag: mesa-4-0-branch t_array_api.c t_array_api.h t_array_import.c t_array_import.h t_context.c t_context.h t_eval_api.c t_eval_api.h t_imm_alloc.c t_imm_alloc.h t_imm_api.c t_imm_api.h t_imm_debug.c t_imm_debug.h t_imm_dlist.c t_imm_dlist.h t_imm_elt.c t_imm_elt.h t_imm_eval.c t_imm_eval.h t_imm_exec.c t_imm_exec.h t_imm_fixup.c t_imm_fixup.h t_pipeline.c t_pipeline.h t_vb_cliptmp.h t_vb_fog.c t_vb_light.c t_vb_lighttmp.h t_vb_normals.c t_vb_points.c t_vb_render.c t_vb_rendertmp.h t_vb_texgen.c t_vb_texmat.c t_vb_vertex.c tnl.h xc/xc/extras/Mesa/src/tnl_dd/: Tag: mesa-4-0-branch t_dd.c t_dd_dmatmp.h t_dd_rendertmp.h t_dd_tritmp.h t_dd_unfilled.h t_dd_vb.c t_dd_vbtmp.h t_dd_vertex.h Removed files: xc/xc/extras/Mesa/docs/: Tag: mesa-4-0-branch RELNOTES-3.4.1 RELNOTES-3.4.2 xc/xc/extras/Mesa/include/GL/: Tag: mesa-4-0-branch vms_x_fix.h xc/xc/extras/Mesa/src/: Tag: mesa-4-0-branch aatriangle.c aatriangle.h aatritemp.h alpha.c alpha.h alphabuf.c alphabuf.h bbox.c bbox.h bitmap.c bitmap.h clip_funcs.h clip_tmp.h copy_tmp.h copypix.c copypix.h cull_tmp.h cva.c cva.h ddsample.c debug_xform.c debug_xform.h dotprod_tmp.h fixed.h fog_tmp.h general_clip.h glapinoop.c glapinoop.h imaging.c imaging.h indirect_tmp.h interp_tmp.h linetemp.h lnaatemp.h logic.c logic.h masking.c masking.h norm_tmp.h pb.c pb.h pipeline.c pipeline.h pixeltex.c pixeltex.h quads.c quads.h readpix.c readpix.h rect.c rect.h render_tmp.h scissor.c scissor.h shade.c shade.h shade_tmp.h span.c span.h stages.c stages.h texgen_tmp.h texture.c texture.h trans_tmp.h translate.c translate.h triangle.c triangle.h tritemp.h types.h vb.c vb.h vbcull.c vbcull.h vbfill.c vbfill.h vbindirect.c vbindirect.h vbrender.c vbrender.h vbxform.c vbxform.h vector.c vector.h vertices.c vertices.h winpos.c winpos.h xform.c xform.h xform_tmp.h zoom.c zoom.h xc/xc/extras/Mesa/src/OSmesa/: Tag: mesa-4-0-branch Makefile.am xc/xc/extras/Mesa/src/X/: Tag: mesa-4-0-branch Makefile.am xmesa1.c xmesa2.c xmesa3.c xmesa4.c xc/xc/extras/Mesa/src/X86/: Tag: mesa-4-0-branch 3dnow_norm_raw.S 3dnow_xform_masked1.S 3dnow_xform_masked2.S 3dnow_xform_masked3.S 3dnow_xform_masked4.S 3dnow_xform_raw1.S 3dnow_xform_raw2.S 3dnow_xform_raw3.S 3dnow_xform_raw4.S Makefile.am katmai.c katmai.h katmai_norm_raw.S katmai_vertex.S katmai_xform_masked1.S katmai_xform_masked2.S katmai_xform_masked3.S katmai_xform_masked4.S katmai_xform_raw1.S katmai_xform_raw2.S katmai_xform_raw3.S katmai_xform_raw4.S x86_xform_masked2.S x86_xform_masked3.S x86_xform_masked4.S x86_xform_raw2.S x86_xform_raw3.S x86_xform_raw4.S xc/xc/include/GL/: Tag: mesa-4-0-branch glx.h glxext.h glxint.h glxmd.h glxproto.h glxtokens.h Revision Changes Path 1.29.2.2 +1 -1 xc/xc/config/cf/host.def 1.20.2.1 +331 -80 xc/xc/extras/Mesa/include/GL/gl.h 1.14.12.1 +1819 -471 xc/xc/extras/Mesa/include/GL/glext.h 1.3.2.1 +42 -21 xc/xc/extras/Mesa/include/GL/osmesa.h 1.8.22.1 +9 -6 xc/xc/extras/Mesa/include/GL/xmesa.h 1.4.86.1 +1 -0 xc/xc/extras/Mesa/include/GL/xmesa_x.h 1.5.26.1 +1 -0 xc/xc/extras/Mesa/include/GL/xmesa_xf86.h 1.14.12.1 +27 -466 xc/xc/extras/Mesa/src/accum.c 1.6.94.1 +8 -15 xc/xc/extras/Mesa/src/accum.h 1.7.84.1 +11 -43 xc/xc/extras/Mesa/src/all.h 1.14.12.1 +273 -91 xc/xc/extras/Mesa/src/attrib.c 1.6.94.1 +8 -7 xc/xc/extras/Mesa/src/attrib.h 1.12.28.1 +185 -647 xc/xc/extras/Mesa/src/blend.c 1.7.88.1 +22 -17 xc/xc/extras/Mesa/src/blend.h 1.9.2.1 +136 -285 xc/xc/extras/Mesa/src/buffers.c 1.3.94.1 +14 -7 xc/xc/extras/Mesa/src/buffers.h 1.9.12.1 +41 -425 xc/xc/extras/Mesa/src/clip.c 1.6.94.1 +8 -62 xc/xc/extras/Mesa/src/clip.h 1.16.20.1 +217 -242 xc/xc/extras/Mesa/src/colortab.c 1.8.78.1 +8 -7 xc/xc/extras/Mesa/src/colortab.h 1.12.28.1 +65 -68 xc/xc/extras/Mesa/src/config.c 1.14.2.1 +37 -49 xc/xc/extras/Mesa/src/config.h 1.18.4.1 +565 -502 xc/xc/extras/Mesa/src/context.c 1.10.66.1 +43 -70 xc/xc/extras/Mesa/src/context.h 1.2.30.1 +1231 -219 xc/xc/extras/Mesa/src/convolve.c 1.13.28.1 +454 -687 xc/xc/extras/Mesa/src/dd.h 1.10.12.1 +46 -1648 xc/xc/extras/Mesa/src/depth.c 1.8.78.1 +8 -43 xc/xc/extras/Mesa/src/depth.h 1.5.94.1 +19 -53 xc/xc/extras/Mesa/src/dispatch.c 1.16.2.1 +1379 -988 xc/xc/extras/Mesa/src/dlist.c 1.8.66.1 +56 -22 xc/xc/extras/Mesa/src/dlist.h 1.13.28.1 +133 -784 xc/xc/extras/Mesa/src/drawpix.c 1.6.94.1 +24 -14 xc/xc/extras/Mesa/src/drawpix.h 1.13.12.1 +824 -596 xc/xc/extras/Mesa/src/enable.c 1.6.94.1 +8 -7 xc/xc/extras/Mesa/src/enable.h 1.13.2.1 +26 -23 xc/xc/extras/Mesa/src/enums.c 1.6.94.1 +9 -8 xc/xc/extras/Mesa/src/enums.h 1.9.28.1 +162 -1756 xc/xc/extras/Mesa/src/eval.c 1.6.94.1 +13 -49 xc/xc/extras/Mesa/src/eval.h 1.17.2.1 +240 -100 xc/xc/extras/Mesa/src/extensions.c 1.7.84.1 +25 -21 xc/xc/extras/Mesa/src/extensions.h 1.9.28.1 +79 -204 xc/xc/extras/Mesa/src/feedback.c 1.6.94.1 +11 -21 xc/xc/extras/Mesa/src/feedback.h 1.14.28.1 +55 -319 xc/xc/extras/Mesa/src/fog.c 1.8.78.1 +8 -27 xc/xc/extras/Mesa/src/fog.h 1.18.2.1 +1186 -907 xc/xc/extras/Mesa/src/get.c 1.6.94.1 +8 -8 xc/xc/extras/Mesa/src/get.h 1.9.28.1 +453 -103 xc/xc/extras/Mesa/src/glapi.c 1.4.94.1 +19 -2 xc/xc/extras/Mesa/src/glapi.h 1.6.66.1 +17 -0 xc/xc/extras/Mesa/src/glapioffsets.h 1.6.66.1 +30 -13 xc/xc/extras/Mesa/src/glapitable.h 1.8.64.1 +1472 -271 xc/xc/extras/Mesa/src/glapitemp.h 1.17.12.1 +66 -3 xc/xc/extras/Mesa/src/glheader.h 1.4.94.1 +14 -13 xc/xc/extras/Mesa/src/glthread.c 1.4.94.1 +15 -14 xc/xc/extras/Mesa/src/glthread.h 1.9.20.1 +15 -7 xc/xc/extras/Mesa/src/hash.c 1.7.84.1 +7 -6 xc/xc/extras/Mesa/src/hash.h 1.6.94.1 +16 -11 xc/xc/extras/Mesa/src/highpc.c 1.6.66.1 +48 -110 xc/xc/extras/Mesa/src/hint.c 1.3.94.1 +8 -10 xc/xc/extras/Mesa/src/hint.h 1.19.2.1 +909 -514 xc/xc/extras/Mesa/src/image.c 1.10.12.1 +54 -38 xc/xc/extras/Mesa/src/image.h 1.10.28.1 +471 -606 xc/xc/extras/Mesa/src/light.c 1.9.28.1 +42 -43 xc/xc/extras/Mesa/src/light.h 1.12.2.1 +36 -1144 xc/xc/extras/Mesa/src/lines.c 1.6.94.1 +8 -10 xc/xc/extras/Mesa/src/lines.h 1.6.94.1 +7 -6 xc/xc/extras/Mesa/src/lowpc.c 1.10.2.1 +60 -114 xc/xc/extras/Mesa/src/macros.h 1.13.6.1 +141 -1234 xc/xc/extras/Mesa/src/matrix.c 1.9.28.1 +9 -58 xc/xc/extras/Mesa/src/matrix.h 1.7.28.1 +99 -2 xc/xc/extras/Mesa/src/mem.c 1.9.28.1 +43 -9 xc/xc/extras/Mesa/src/mem.h 1.8.78.1 +36 -41 xc/xc/extras/Mesa/src/mmath.c 1.21.2.1 +420 -166 xc/xc/extras/Mesa/src/mmath.h 1.10.2.1 +386 -190 xc/xc/extras/Mesa/src/pixel.c 1.7.78.1 +22 -13 xc/xc/extras/Mesa/src/pixel.h 1.11.28.1 +59 -1311 xc/xc/extras/Mesa/src/points.c 1.6.94.1 +8 -9 xc/xc/extras/Mesa/src/points.h 1.7.84.1 +69 -48 xc/xc/extras/Mesa/src/polygon.c 1.6.94.1 +8 -8 xc/xc/extras/Mesa/src/polygon.h 1.7.84.1 +526 -59 xc/xc/extras/Mesa/src/rastpos.c 1.6.94.1 +84 -7 xc/xc/extras/Mesa/src/rastpos.h 1.6.94.1 +8 -8 xc/xc/extras/Mesa/src/simple_list.h 1.13.20.1 +432 -688 xc/xc/extras/Mesa/src/state.c 1.4.66.1 +14 -14 xc/xc/extras/Mesa/src/state.h 1.12.2.1 +62 -1287 xc/xc/extras/Mesa/src/stencil.c 1.7.78.1 +8 -35 xc/xc/extras/Mesa/src/stencil.h 1.2.14.1 +494 -196 xc/xc/extras/Mesa/src/texformat.c 1.2.14.1 +64 -13 xc/xc/extras/Mesa/src/texformat.h 1.24.2.1 +1038 -1700xc/xc/extras/Mesa/src/teximage.c 1.14.8.1 +17 -20 xc/xc/extras/Mesa/src/teximage.h 1.20.8.1 +172 -149 xc/xc/extras/Mesa/src/texobj.c 1.7.66.1 +13 -11 xc/xc/extras/Mesa/src/texobj.h 1.19.2.1 +1072 -607 xc/xc/extras/Mesa/src/texstate.c 1.6.94.1 +35 -19 xc/xc/extras/Mesa/src/texstate.h 1.12.2.1 +162 -520 xc/xc/extras/Mesa/src/texutil.c 1.6.2.1 +6 -20 xc/xc/extras/Mesa/src/texutil.h 1.3.2.1 +71 -41 xc/xc/extras/Mesa/src/texutil_tmp.h 1.16.20.1 +218 -1338 xc/xc/extras/Mesa/src/varray.c 1.8.18.1 +17 -54 xc/xc/extras/Mesa/src/varray.h 1.8.12.1 +1242 -763 xc/xc/extras/Mesa/src/OSmesa/osmesa.c 1.15.2.1 +806 -153 xc/xc/extras/Mesa/src/X/fakeglx.c 1.7.64.1 +696 -145 xc/xc/extras/Mesa/src/X/glxapi.c 1.7.64.1 +92 -29 xc/xc/extras/Mesa/src/X/glxapi.h 1.5.6.1 +4 -7 xc/xc/extras/Mesa/src/X/glxheader.h 1.9.2.1 +9 -10 xc/xc/extras/Mesa/src/X/xfonts.c 1.1.1.2.6.1 +4 -4 xc/xc/extras/Mesa/src/X/xfonts.h 1.14.2.1 +37 -54 xc/xc/extras/Mesa/src/X/xmesaP.h 1.9.20.1 +49 -140 xc/xc/extras/Mesa/src/X86/3dnow.c 1.6.20.1 +7 -5 xc/xc/extras/Mesa/src/X86/3dnow.h 1.2.28.1 +10 -10 xc/xc/extras/Mesa/src/X86/3dnow_vertex.S 1.8.28.1 +1 -0 xc/xc/extras/Mesa/src/X86/assyntax.h 1.2.30.1 +5 -20 xc/xc/extras/Mesa/src/X86/clip_args.h 1.11.2.1 +39 -54 xc/xc/extras/Mesa/src/X86/common_x86.c 1.7.2.1 +14 -13 xc/xc/extras/Mesa/src/X86/common_x86_asm.S 1.3.22.1 +10 -8 xc/xc/extras/Mesa/src/X86/common_x86_asm.h 1.2.30.1 +11 -7 xc/xc/extras/Mesa/src/X86/common_x86_features.h 1.6.62.1 +380 -1206 xc/xc/extras/Mesa/src/X86/glapi_x86.S 1.3.28.1 +5 -47 xc/xc/extras/Mesa/src/X86/mmx.h 1.3.26.1 +3 -3 xc/xc/extras/Mesa/src/X86/mmx_blend.S 1.9.28.1 +54 -83 xc/xc/extras/Mesa/src/X86/x86.c 1.5.28.1 +5 -4 xc/xc/extras/Mesa/src/X86/x86.h 1.2.30.1 +167 -28 xc/xc/extras/Mesa/src/X86/x86_cliptest.S 1.2.28.1 +7 -7 xc/xc/extras/Mesa/src/X86/x86_vertex.S 1.2.30.1 +4 -25 xc/xc/extras/Mesa/src/X86/xform_args.h 1.9.2.3 +3 -6 xc/xc/include/GL/Imakefile 1.9.6.2 +1 -0 xc/xc/lib/GL/dri/Imakefile 1.10.6.2 +1 -0 xc/xc/lib/GL/glx/Imakefile 1.4.6.2 +2 -13 xc/xc/lib/GL/include/GL/internal/glcore.h 1.28.2.3 +1 -1 xc/xc/lib/GL/mesa/src/Imakefile 1.11.2.3 +3 -2 xc/xc/lib/GL/mesa/src/OSmesa/Imakefile 1.1.4.2 +1 -1 xc/xc/lib/GL/mesa/src/X/Attic/Imakefile.inc 1.1.6.2 +1 -1 xc/xc/lib/GL/mesa/src/drv/gamma/Attic/gamma_state.c 1.7.2.2 +1 -1 xc/xc/programs/Xserver/GL/glx/glxcmds.c 1.17.4.3 +1 -1 xc/xc/programs/Xserver/GL/mesa/src/Imakefile 1.11.8.2 +2 -1 xc/xc/programs/Xserver/GL/mesa/src/X/xf86glx.c 1.1.1.4.36.2 +1 -1 xc/xc/programs/Xserver/GL/mesa/src/X/xf86glxint.h |