Ros-diffs

ros-diffs@reactos.org

81390 discussions

[blight] 18998: Forhot to set the svn:eol-sytle
by blight＠svn.reactos.com 04 Nov '05

04 Nov '05

Forhot to set the svn:eol-sytle Modified: vendor/Mesa3D/current/windows/VC6/mesa/gdi/gdi.dsp Modified: vendor/Mesa3D/current/windows/VC6/mesa/glu/glu.dsp Modified: vendor/Mesa3D/current/windows/VC6/mesa/mesa/mesa.dsp Modified: vendor/Mesa3D/current/windows/VC6/mesa/mesa.dsw Modified: vendor/Mesa3D/current/windows/VC6/mesa/osmesa/osmesa.dsp Modified: vendor/Mesa3D/current/windows/VC7/mesa/glu/glu.vcproj Modified: vendor/Mesa3D/current/windows/VC7/mesa/mesa/mesa.vcproj Modified: vendor/Mesa3D/current/windows/VC7/mesa/mesa.sln Modified: vendor/Mesa3D/current/windows/VC7/mesa/osmesa/osmesa.vcproj Property changes on: vendor/Mesa3D/current/Makefile.DJ ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/Makefile.mgw ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/bin/installmesa ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/bin/mklib ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/CVS/Entries ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/CVS/Repository ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/CVS/Root ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/CVS/Tag ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/CVS/Template ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/aix ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/aix-64 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/aix-gcc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/aix-static ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/beos ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/darwin ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/darwin-static ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/default ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/freebsd ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/freebsd-dri ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/freebsd-dri-amd64 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/freebsd-dri-x86 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/hpux10 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/hpux10-gcc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/hpux10-static ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/hpux11-32 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/hpux11-32-static ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/hpux11-32-static-nothreads ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/hpux11-64 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/hpux11-64-static ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/hpux9 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/hpux9-gcc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/irix6-64 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/irix6-64-static ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/irix6-n32 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/irix6-n32-static ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/irix6-o32 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/irix6-o32-static ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/linux ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/linux-alpha ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/linux-alpha-static ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/linux-debug ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/linux-directfb ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/linux-dri ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/linux-dri-ppc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/linux-dri-x86 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/linux-dri-x86-64 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/linux-fbdev ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/linux-glide ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/linux-icc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/linux-icc-static ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/linux-indirect ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/linux-osmesa16 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/linux-osmesa16-static ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/linux-osmesa32 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/linux-ppc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/linux-ppc-static ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/linux-profile ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/linux-solo ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/linux-solo-ia64 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/linux-solo-x86 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/linux-sparc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/linux-sparc5 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/linux-static ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/linux-tcc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/linux-ultrasparc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/linux-x86 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/linux-x86-32 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/linux-x86-64 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/linux-x86-64-debug ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/linux-x86-64-static ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/linux-x86-debug ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/linux-x86-glide ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/linux-x86-static ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/linux-x86-xcb ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/netbsd ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/openbsd ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/osf1 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/solaris-x86 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/solaris-x86-gcc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/sunos4 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/sunos4-gcc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/sunos4-static ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/sunos5 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/sunos5-gcc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/sunos5-smp ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/configs/ultrix-gcc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/descrip.mms ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/COPYING ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/MESA_agp_offset.spec ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/MESA_copy_sub_buffer.spec ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/MESA_pack_invert.spec ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/MESA_packed_depth_stencil.spec ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/MESA_pixmap_colormap.spec ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/MESA_program_debug.spec ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/MESA_release_buffers.spec ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/MESA_resize_buffers.spec ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/MESA_set_3dfx_mode.spec ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/MESA_sprite_point.spec ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/MESA_swap_control.spec ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/MESA_swap_frame_usage.spec ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/MESA_trace.spec ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/MESA_window_pos.spec ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/MESA_ycbcr_texture.spec ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/MiniGLX.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/README.3DFX ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/README.AMIWIN ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/README.BEOS ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/README.CYGWIN ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/README.D3D ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/README.DJ ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/README.GGI ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/README.LYNXOS ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/README.MINGW32 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/README.MITS ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/README.NeXT ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/README.OS2 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/README.OpenStep ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/README.QUAKE ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/README.THREADS ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/README.VMS ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/README.WIN32 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/README.WINDML ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/README.X11 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/README.directfb ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/RELNOTES-3.1 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/RELNOTES-3.2 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/RELNOTES-3.2.1 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/RELNOTES-3.3 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/RELNOTES-3.4 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/RELNOTES-3.4.1 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/RELNOTES-3.4.2 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/RELNOTES-3.5 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/RELNOTES-4.0 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/RELNOTES-4.0.1 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/RELNOTES-4.0.2 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/RELNOTES-4.0.3 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/RELNOTES-4.1 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/RELNOTES-5.0 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/RELNOTES-5.0.1 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/RELNOTES-5.0.2 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/RELNOTES-5.1 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/RELNOTES-6.0 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/RELNOTES-6.0.1 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/RELNOTES-6.1 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/RELNOTES-6.2 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/RELNOTES-6.2.1 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/RELNOTES-6.3 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/RELNOTES-6.3.1 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/RELNOTES-6.3.2 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/RELNOTES-6.4 ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/VERSIONS ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/banner.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/bugs.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/conform.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/contents.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/custom.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/cvs_access.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/cvs_branches.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/debugging.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/demos.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/devinfo.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/download.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/envvars.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/extensions.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/faq.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/fbdev-dri.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/games.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/glfbdev-driver.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/glu.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/helpwanted.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/index.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/install.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/intro.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/libraries.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/license.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/lists.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/mangling.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/modelers.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/news.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/osmesa.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/pbuffers.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/perf.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/precompiled.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/relnotes.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/science.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/sourcedocs.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/subset-A.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/subset.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/systems.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/thanks.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/utilities.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/utility.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/docs/webmaster.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/mms-config. ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/progs/util/README ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/progs/util/sampleMakefile ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/descrip.mms ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/descrip.mms ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/Makefile.DJ ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/Makefile.win ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/descrip.mms ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/dummy.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/interface/bezierEval.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/interface/bezierPatch.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/interface/bezierPatchMesh.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/interface/glcurveval.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/interface/glinterface.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/interface/glrenderer.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/interface/glsurfeval.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/interface/incurveeval.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/interface/insurfeval.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/internals/arc.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/internals/arcsorter.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/internals/arctess.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/internals/backend.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/internals/basiccrveval.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/internals/basicsurfeval.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/internals/bin.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/internals/bufpool.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/internals/cachingeval.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/internals/ccw.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/internals/coveandtiler.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/internals/curve.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/internals/curvelist.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/internals/curvesub.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/internals/dataTransform.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/internals/displaylist.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/internals/flist.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/internals/flistsorter.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/internals/hull.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/internals/intersect.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/internals/knotvector.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/internals/mapdesc.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/internals/mapdescv.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/internals/maplist.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/internals/mesher.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/internals/monoTriangulationBa ckend.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/internals/monotonizer.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/internals/mycode.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/internals/nurbsinterfac.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/internals/nurbstess.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/internals/patch.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/internals/patchlist.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/internals/quilt.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/internals/reader.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/internals/renderhints.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/internals/slicer.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/internals/sorter.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/internals/splitarcs.cc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/Mesa3D/current/src/glu/sgi/libnurbs/internals/subdivider.cc ___________________________________________________________________ Name: svn:eol-style + native [truncated at 1000 lines; 9794 more skipped]

1 0

[blight] 18997: Import Mesa-6.4 release. (Thanks GvG :-)
by blight＠svn.reactos.com 04 Nov '05

04 Nov '05

Import Mesa-6.4 release. (Thanks GvG :-) Modified: vendor/Mesa3D/current/Makefile Modified: vendor/Mesa3D/current/Makefile.DJ Modified: vendor/Mesa3D/current/Makefile.mgw Deleted: vendor/Mesa3D/current/Mesa.dsw Modified: vendor/Mesa3D/current/bin/installmesa Modified: vendor/Mesa3D/current/bin/mklib Modified: vendor/Mesa3D/current/configs/CVS/Entries Added: vendor/Mesa3D/current/configs/CVS/Tag Modified: vendor/Mesa3D/current/configs/darwin Modified: vendor/Mesa3D/current/configs/default Modified: vendor/Mesa3D/current/configs/freebsd Added: vendor/Mesa3D/current/configs/freebsd-dri Added: vendor/Mesa3D/current/configs/freebsd-dri-amd64 Added: vendor/Mesa3D/current/configs/freebsd-dri-x86 Modified: vendor/Mesa3D/current/configs/linux Modified: vendor/Mesa3D/current/configs/linux-debug Added: vendor/Mesa3D/current/configs/linux-directfb Modified: vendor/Mesa3D/current/configs/linux-dri Added: vendor/Mesa3D/current/configs/linux-dri-ppc Modified: vendor/Mesa3D/current/configs/linux-dri-x86 Modified: vendor/Mesa3D/current/configs/linux-dri-x86-64 Added: vendor/Mesa3D/current/configs/linux-fbdev Added: vendor/Mesa3D/current/configs/linux-indirect Modified: vendor/Mesa3D/current/configs/linux-ppc Modified: vendor/Mesa3D/current/configs/linux-ppc-static Added: vendor/Mesa3D/current/configs/linux-profile Modified: vendor/Mesa3D/current/configs/linux-solo Modified: vendor/Mesa3D/current/configs/linux-solo-ia64 Modified: vendor/Mesa3D/current/configs/linux-solo-x86 Modified: vendor/Mesa3D/current/configs/linux-sparc Modified: vendor/Mesa3D/current/configs/linux-static Modified: vendor/Mesa3D/current/configs/linux-tcc Modified: vendor/Mesa3D/current/configs/linux-x86 Added: vendor/Mesa3D/current/configs/linux-x86-32 Modified: vendor/Mesa3D/current/configs/linux-x86-64 Added: vendor/Mesa3D/current/configs/linux-x86-64-debug Modified: vendor/Mesa3D/current/configs/linux-x86-64-static Modified: vendor/Mesa3D/current/configs/linux-x86-debug Modified: vendor/Mesa3D/current/configs/linux-x86-static Added: vendor/Mesa3D/current/configs/linux-x86-xcb Modified: vendor/Mesa3D/current/configs/osf1 Modified: vendor/Mesa3D/current/configs/solaris-x86 Modified: vendor/Mesa3D/current/configs/sunos5-gcc Modified: vendor/Mesa3D/current/descrip.mms Deleted: vendor/Mesa3D/current/docs/INSTALL.GNU Modified: vendor/Mesa3D/current/docs/README.3DFX Modified: vendor/Mesa3D/current/docs/README.BEOS Modified: vendor/Mesa3D/current/docs/README.DJ Modified: vendor/Mesa3D/current/docs/README.MINGW32 Modified: vendor/Mesa3D/current/docs/README.VMS Modified: vendor/Mesa3D/current/docs/README.WIN32 Added: vendor/Mesa3D/current/docs/README.directfb Modified: vendor/Mesa3D/current/docs/RELNOTES-6.2 Added: vendor/Mesa3D/current/docs/RELNOTES-6.2.1 Added: vendor/Mesa3D/current/docs/RELNOTES-6.3 Added: vendor/Mesa3D/current/docs/RELNOTES-6.3.1 Added: vendor/Mesa3D/current/docs/RELNOTES-6.3.2 Added: vendor/Mesa3D/current/docs/RELNOTES-6.4 Modified: vendor/Mesa3D/current/docs/VERSIONS Modified: vendor/Mesa3D/current/docs/banner.html Modified: vendor/Mesa3D/current/docs/bugs.html Modified: vendor/Mesa3D/current/docs/conform.html Modified: vendor/Mesa3D/current/docs/contents.html Modified: vendor/Mesa3D/current/docs/custom.html Modified: vendor/Mesa3D/current/docs/cvs_access.html Modified: vendor/Mesa3D/current/docs/cvs_branches.html Modified: vendor/Mesa3D/current/docs/debugging.html Modified: vendor/Mesa3D/current/docs/demos.html Modified: vendor/Mesa3D/current/docs/devinfo.html Modified: vendor/Mesa3D/current/docs/download.html Modified: vendor/Mesa3D/current/docs/envvars.html Modified: vendor/Mesa3D/current/docs/extensions.html Modified: vendor/Mesa3D/current/docs/faq.html Modified: vendor/Mesa3D/current/docs/fbdev-dri.html Modified: vendor/Mesa3D/current/docs/games.html Modified: vendor/Mesa3D/current/docs/glfbdev-driver.html Modified: vendor/Mesa3D/current/docs/glu.html Modified: vendor/Mesa3D/current/docs/helpwanted.html Modified: vendor/Mesa3D/current/docs/index.html Modified: vendor/Mesa3D/current/docs/install.html Modified: vendor/Mesa3D/current/docs/intro.html Modified: vendor/Mesa3D/current/docs/libraries.html Modified: vendor/Mesa3D/current/docs/license.html Modified: vendor/Mesa3D/current/docs/lists.html Modified: vendor/Mesa3D/current/docs/mangling.html Modified: vendor/Mesa3D/current/docs/modelers.html Modified: vendor/Mesa3D/current/docs/news.html Modified: vendor/Mesa3D/current/docs/osmesa.html Modified: vendor/Mesa3D/current/docs/pbuffers.html Modified: vendor/Mesa3D/current/docs/perf.html Modified: vendor/Mesa3D/current/docs/precompiled.html Modified: vendor/Mesa3D/current/docs/relnotes.html Modified: vendor/Mesa3D/current/docs/science.html Modified: vendor/Mesa3D/current/docs/sourcedocs.html Modified: vendor/Mesa3D/current/docs/subset.html Modified: vendor/Mesa3D/current/docs/systems.html Modified: vendor/Mesa3D/current/docs/thanks.html Modified: vendor/Mesa3D/current/docs/utilities.html Modified: vendor/Mesa3D/current/docs/utility.html Modified: vendor/Mesa3D/current/docs/webmaster.html [truncated at 100 lines; 1113 more skipped] _____ Modified: vendor/Mesa3D/current/Makefile --- vendor/Mesa3D/current/Makefile 2005-11-04 16:26:13 UTC (rev 18996) +++ vendor/Mesa3D/current/Makefile 2005-11-04 16:36:25 UTC (rev 18997) @@ -25,12 +25,21 @@ $(MAKE) clean -rm -rf lib* -rm -f $(TOP)/configs/current + -rm -f `find . -name \*.o` + -rm -f `find . -name \*.a` + -rm -f `find . -name \*.so` + -rm -f `find . -name depend` + install: @echo "Installing" - $(TOP)/bin/installmesa + $(TOP)/bin/installmesa $(DESTDIR) +# DirectFBGL module installation +linux-directfb-install: + cd src/mesa/drivers/directfb && $(MAKE) install + # If there's no current configuration file $(TOP)/configs/current: @echo @@ -52,6 +61,9 @@ darwin \ darwin-static \ freebsd \ +freebsd-dri \ +freebsd-dri-amd64 \ +freebsd-dri-x86 \ hpux10 \ hpux10-gcc \ hpux10-static \ @@ -72,9 +84,13 @@ linux-alpha \ linux-alpha-static \ linux-debug \ +linux-directfb \ linux-dri \ linux-dri-x86 \ linux-dri-x86-64 \ +linux-dri-ppc \ +linux-indirect \ +linux-fbdev \ linux-glide \ linux-icc \ linux-icc-static \ @@ -93,8 +109,11 @@ linux-tcc \ linux-x86 \ linux-x86-debug \ +linux-x86-32 \ linux-x86-64 \ +linux-x86-64-debug \ linux-x86-64-static \ +linux-x86-xcb \ linux-x86-glide \ linux-x86-static \ netbsd \ @@ -115,28 +134,28 @@ # Rules for making release tarballs -DIRECTORY = Mesa-6.2 -LIB_NAME = MesaLib-6.2 -DEMO_NAME = MesaDemos-6.2 +DIRECTORY = Mesa-6.4 +LIB_NAME = MesaLib-6.4 +DEMO_NAME = MesaDemos-6.4 +GLUT_NAME = MesaGLUT-6.4 -LIB_FILES = \ +MAIN_FILES = \ $(DIRECTORY)/Makefile* \ $(DIRECTORY)/descrip.mms \ $(DIRECTORY)/mms-config. \ - $(DIRECTORY)/Mesa.dsw \ $(DIRECTORY)/bin/mklib \ $(DIRECTORY)/bin/installmesa \ $(DIRECTORY)/configs/[a-z]* \ $(DIRECTORY)/docs/*.html \ $(DIRECTORY)/docs/COPYING \ - $(DIRECTORY)/docs/INSTALL.GNU \ $(DIRECTORY)/docs/README.* \ $(DIRECTORY)/docs/RELNOTES* \ $(DIRECTORY)/docs/VERSIONS \ $(DIRECTORY)/docs/*.spec \ $(DIRECTORY)/include/GL/internal/glcore.h \ + $(DIRECTORY)/include/GL/amesa.h \ $(DIRECTORY)/include/GL/dmesa.h \ - $(DIRECTORY)/include/GL/amesa.h \ + $(DIRECTORY)/include/GL/directfbgl.h \ $(DIRECTORY)/include/GL/fxmesa.h \ $(DIRECTORY)/include/GL/ggimesa.h \ $(DIRECTORY)/include/GL/gl.h \ @@ -157,6 +176,7 @@ $(DIRECTORY)/include/GL/xmesa.h \ $(DIRECTORY)/include/GL/xmesa_x.h \ $(DIRECTORY)/include/GL/xmesa_xf86.h \ + $(DIRECTORY)/include/GLView.h \ $(DIRECTORY)/src/Makefile \ $(DIRECTORY)/src/descrip.mms \ $(DIRECTORY)/src/mesa/Makefile* \ @@ -164,28 +184,25 @@ $(DIRECTORY)/src/mesa/descrip.mms \ $(DIRECTORY)/src/mesa/depend \ $(DIRECTORY)/src/mesa/main/*.[chS] \ - $(DIRECTORY)/src/mesa/main/main.dsp \ $(DIRECTORY)/src/mesa/main/descrip.mms \ $(DIRECTORY)/src/mesa/glapi/*.[chS] \ - $(DIRECTORY)/src/mesa/glapi/glapi.dsp \ $(DIRECTORY)/src/mesa/glapi/descrip.mms \ $(DIRECTORY)/src/mesa/array_cache/*.[ch] \ - $(DIRECTORY)/src/mesa/array_cache/array_cache.dsp \ $(DIRECTORY)/src/mesa/array_cache/descrip.mms \ $(DIRECTORY)/src/mesa/math/*.[ch] \ - $(DIRECTORY)/src/mesa/math/math.dsp \ $(DIRECTORY)/src/mesa/math/descrip.mms \ $(DIRECTORY)/src/mesa/shader/*.[ch] \ - $(DIRECTORY)/src/mesa/shader/shader.dsp \ $(DIRECTORY)/src/mesa/shader/descrip.mms \ + $(DIRECTORY)/src/mesa/shader/grammar/*.[ch] \ + $(DIRECTORY)/src/mesa/shader/grammar/descrip.mms \ + $(DIRECTORY)/src/mesa/shader/slang/*.[ch] \ + $(DIRECTORY)/src/mesa/shader/slang/descrip.mms \ + $(DIRECTORY)/src/mesa/shader/slang/library/*.[ch] \ $(DIRECTORY)/src/mesa/swrast/*.[ch] \ - $(DIRECTORY)/src/mesa/swrast/swrast.dsp \ $(DIRECTORY)/src/mesa/swrast/descrip.mms \ $(DIRECTORY)/src/mesa/swrast_setup/*.[ch] \ - $(DIRECTORY)/src/mesa/swrast_setup/swrast_setup.dsp \ $(DIRECTORY)/src/mesa/swrast_setup/descrip.mms \ $(DIRECTORY)/src/mesa/tnl/*.[chS] \ - $(DIRECTORY)/src/mesa/tnl/tnl.dsp \ $(DIRECTORY)/src/mesa/tnl/descrip.mms \ $(DIRECTORY)/src/mesa/tnl_dd/*.[ch] \ $(DIRECTORY)/src/mesa/tnl_dd/imm/*.[ch] \ @@ -194,11 +211,11 @@ $(DIRECTORY)/src/mesa/drivers/beos/Makefile \ $(DIRECTORY)/src/mesa/drivers/common/*.[ch] \ $(DIRECTORY)/src/mesa/drivers/common/descrip.mms \ + $(DIRECTORY)/src/mesa/drivers/directfb/*.[ch] \ + $(DIRECTORY)/src/mesa/drivers/directfb/Makefile \ $(DIRECTORY)/src/mesa/drivers/dos/*.[chS] \ - $(DIRECTORY)/src/mesa/drivers/dri/common/*.[ch] \ $(DIRECTORY)/src/mesa/drivers/fbdev/glfbdev.c \ $(DIRECTORY)/src/mesa/drivers/glide/*.[ch] \ - $(DIRECTORY)/src/mesa/drivers/glide/*.def \ $(DIRECTORY)/src/mesa/drivers/ggi/*.[ch] \ $(DIRECTORY)/src/mesa/drivers/ggi/ggimesa.conf.in \ $(DIRECTORY)/src/mesa/drivers/ggi/default/*.c \ @@ -209,26 +226,62 @@ $(DIRECTORY)/src/mesa/drivers/osmesa/Makefile.win \ $(DIRECTORY)/src/mesa/drivers/osmesa/descrip.mms \ $(DIRECTORY)/src/mesa/drivers/osmesa/osmesa.def \ - $(DIRECTORY)/src/mesa/drivers/osmesa/osmesa.dsp \ $(DIRECTORY)/src/mesa/drivers/osmesa/*.[ch] \ $(DIRECTORY)/src/mesa/drivers/svga/*.[ch] \ $(DIRECTORY)/src/mesa/drivers/windows/*/*.[ch] \ $(DIRECTORY)/src/mesa/drivers/windows/*/*.def \ - $(DIRECTORY)/src/mesa/drivers/windows/*/*.dsp \ $(DIRECTORY)/src/mesa/drivers/x11/descrip.mms \ $(DIRECTORY)/src/mesa/drivers/x11/*.[ch] \ + $(DIRECTORY)/src/mesa/ppc/*.[ch] \ $(DIRECTORY)/src/mesa/sparc/*.[chS] \ $(DIRECTORY)/src/mesa/x86/Makefile \ $(DIRECTORY)/src/mesa/x86/*.[ch] \ $(DIRECTORY)/src/mesa/x86/*.S \ + $(DIRECTORY)/src/mesa/x86/rtasm/*.[ch] \ + $(DIRECTORY)/src/mesa/x86-64/*.[chS] \ + $(DIRECTORY)/src/mesa/x86-64/Makefile \ + $(DIRECTORY)/progs/Makefile \ + $(DIRECTORY)/progs/util/README \ + $(DIRECTORY)/progs/util/*.[ch] \ + $(DIRECTORY)/progs/util/sampleMakefile \ + $(DIRECTORY)/vms/analyze_map.com \ + $(DIRECTORY)/vms/xlib.opt \ + $(DIRECTORY)/vms/xlib_share.opt \ + $(DIRECTORY)/windows/VC6/mesa/gdi/gdi.dsp \ + $(DIRECTORY)/windows/VC6/mesa/glu/*.txt \ + $(DIRECTORY)/windows/VC6/mesa/glu/glu.dsp \ + $(DIRECTORY)/windows/VC6/mesa/mesa.dsw \ + $(DIRECTORY)/windows/VC6/mesa/mesa/mesa.dsp \ + $(DIRECTORY)/windows/VC6/mesa/osmesa/osmesa.dsp \ + $(DIRECTORY)/windows/VC7/mesa/gdi/gdi.vcproj \ + $(DIRECTORY)/windows/VC7/mesa/glu/glu.vcproj \ + $(DIRECTORY)/windows/VC7/mesa/mesa.sln \ + $(DIRECTORY)/windows/VC7/mesa/mesa/mesa.vcproj \ + $(DIRECTORY)/windows/VC7/mesa/osmesa/osmesa.vcproj + +DRI_FILES = \ + $(DIRECTORY)/include/GL/internal/dri_interface.h \ + $(DIRECTORY)/include/GL/internal/sarea.h \ + $(DIRECTORY)/src/glx/Makefile \ + $(DIRECTORY)/src/glx/x11/Makefile \ + $(DIRECTORY)/src/glx/x11/*.[ch] \ + $(DIRECTORY)/src/mesa/drivers/dri/Makefile \ + $(DIRECTORY)/src/mesa/drivers/dri/Makefile.template \ + $(DIRECTORY)/src/mesa/drivers/dri/common/xmlpool/*.[ch] \ + $(DIRECTORY)/src/mesa/drivers/dri/common/xmlpool/*.po \ + $(DIRECTORY)/src/mesa/drivers/dri/dri_client/imports/*.h \ + $(DIRECTORY)/src/mesa/drivers/dri/*/*.[chS] \ + $(DIRECTORY)/src/mesa/drivers/dri/*/Makefile \ + $(DIRECTORY)/src/mesa/drivers/dri/*/Doxyfile \ + $(DIRECTORY)/src/mesa/drivers/dri/*/server/*.[ch] + +SGI_GLU_FILES = \ $(DIRECTORY)/src/glu/Makefile \ $(DIRECTORY)/src/glu/descrip.mms \ $(DIRECTORY)/src/glu/sgi/Makefile \ $(DIRECTORY)/src/glu/sgi/Makefile.win \ $(DIRECTORY)/src/glu/sgi/Makefile.DJ \ - $(DIRECTORY)/src/glu/sgi/cc*.txt \ $(DIRECTORY)/src/glu/sgi/glu.def \ - $(DIRECTORY)/src/glu/sgi/glu.dsp \ $(DIRECTORY)/src/glu/sgi/dummy.cc \ $(DIRECTORY)/src/glu/sgi/descrip.mms \ $(DIRECTORY)/src/glu/sgi/mesaglu.opt \ @@ -242,45 +295,24 @@ $(DIRECTORY)/src/glu/sgi/libtess/README \ $(DIRECTORY)/src/glu/sgi/libtess/alg-outline \ $(DIRECTORY)/src/glu/sgi/libtess/*.[ch] \ - $(DIRECTORY)/src/glu/sgi/libutil/*.[ch] \ - $(DIRECTORY)/src/glu/mesa/README[12] \ - $(DIRECTORY)/src/glu/mesa/Makefile* \ - $(DIRECTORY)/src/glu/mesa/descrip.mms \ - $(DIRECTORY)/src/glu/mesa/mms_depend \ - $(DIRECTORY)/src/glu/mesa/*.def \ - $(DIRECTORY)/src/glu/mesa/depend \ - $(DIRECTORY)/src/glu/mesa/*.[ch] \ - $(DIRECTORY)/src/glw/*.[ch] \ - $(DIRECTORY)/src/glw/Makefile* \ - $(DIRECTORY)/src/glw/README \ - $(DIRECTORY)/src/glw/depend \ - $(DIRECTORY)/progs/Makefile \ - $(DIRECTORY)/progs/util/README \ - $(DIRECTORY)/progs/util/*.[ch] \ - $(DIRECTORY)/progs/util/sampleMakefile \ - $(DIRECTORY)/vms/analyze_map.com \ - $(DIRECTORY)/vms/xlib.opt \ - $(DIRECTORY)/vms/xlib_share.opt + $(DIRECTORY)/src/glu/sgi/libutil/*.[ch] +MESA_GLU_FILES = \ + $(DIRECTORY)/src/glu/mesa/README[12] \ + $(DIRECTORY)/src/glu/mesa/Makefile* \ + $(DIRECTORY)/src/glu/mesa/descrip.mms \ + $(DIRECTORY)/src/glu/mesa/mms_depend \ + $(DIRECTORY)/src/glu/mesa/*.def \ + $(DIRECTORY)/src/glu/mesa/depend \ + $(DIRECTORY)/src/glu/mesa/*.[ch] -DEMO_FILES = \ - $(DIRECTORY)/include/GL/glut.h \ - $(DIRECTORY)/include/GL/glutf90.h \ - $(DIRECTORY)/src/glut/glx/Makefile* \ - $(DIRECTORY)/src/glut/glx/depend \ - $(DIRECTORY)/src/glut/glx/*def \ - $(DIRECTORY)/src/glut/glx/descrip.mms \ - $(DIRECTORY)/src/glut/glx/mms_depend \ - $(DIRECTORY)/src/glut/glx/glut.dsp \ - $(DIRECTORY)/src/glut/glx/*.[ch] \ - $(DIRECTORY)/src/glut/beos/*.[ch] \ - $(DIRECTORY)/src/glut/beos/*.cpp \ - $(DIRECTORY)/src/glut/beos/Makefile \ - $(DIRECTORY)/src/glut/dos/*.[ch] \ - $(DIRECTORY)/src/glut/dos/Makefile.DJ \ - $(DIRECTORY)/src/glut/dos/PC_HW/*.[chS] \ - $(DIRECTORY)/src/glut/ggi/*.[ch] \ - $(DIRECTORY)/src/glut/ggi/Makefile \ +GLW_FILES = \ + $(DIRECTORY)/src/glw/*.[ch] \ + $(DIRECTORY)/src/glw/Makefile* \ + $(DIRECTORY)/src/glw/README \ + $(DIRECTORY)/src/glw/depend + +DEMO_FILES = \ $(DIRECTORY)/progs/beos/*.cpp \ $(DIRECTORY)/progs/beos/Makefile \ $(DIRECTORY)/progs/images/*.rgb \ @@ -291,8 +323,6 @@ $(DIRECTORY)/progs/demos/*.cxx \ $(DIRECTORY)/progs/demos/*.dat \ $(DIRECTORY)/progs/demos/README \ - $(DIRECTORY)/progs/demos/Windows/*.dsp \ - $(DIRECTORY)/progs/demos/Windows/*.dsw \ $(DIRECTORY)/progs/xdemos/Makefile* \ $(DIRECTORY)/progs/xdemos/descrip.mms \ $(DIRECTORY)/progs/xdemos/*.[chf] \ @@ -305,68 +335,109 @@ $(DIRECTORY)/progs/windml/Makefile.ugl \ $(DIRECTORY)/progs/windml/*.c \ $(DIRECTORY)/progs/windml/*.bmp \ - $(DIRECTORY)/progs/ggi/*.c + $(DIRECTORY)/progs/ggi/*.c \ + $(DIRECTORY)/windows/VC6/progs/demos/*.dsp \ + $(DIRECTORY)/windows/VC6/progs/progs.dsw \ + $(DIRECTORY)/windows/VC7/progs/demos/*.vcproj \ + $(DIRECTORY)/windows/VC7/progs/progs.sln +GLUT_FILES = \ + $(DIRECTORY)/include/GL/glut.h \ + $(DIRECTORY)/include/GL/glutf90.h \ + $(DIRECTORY)/src/glut/glx/Makefile* \ + $(DIRECTORY)/src/glut/glx/depend \ + $(DIRECTORY)/src/glut/glx/*def \ + $(DIRECTORY)/src/glut/glx/descrip.mms \ + $(DIRECTORY)/src/glut/glx/mms_depend \ + $(DIRECTORY)/src/glut/glx/*.[ch] \ + $(DIRECTORY)/src/glut/beos/*.[ch] \ + $(DIRECTORY)/src/glut/beos/*.cpp \ + $(DIRECTORY)/src/glut/beos/Makefile \ + $(DIRECTORY)/src/glut/dos/*.[ch] \ + $(DIRECTORY)/src/glut/dos/Makefile.DJ \ + $(DIRECTORY)/src/glut/dos/PC_HW/*.[chS] \ + $(DIRECTORY)/src/glut/ggi/*.[ch] \ + $(DIRECTORY)/src/glut/ggi/Makefile \ + $(DIRECTORY)/windows/VC6/progs/glut/glut.dsp \ + $(DIRECTORY)/windows/VC7/progs/glut/glut.vcproj -DRI_FILES = \ - $(DIRECTORY)/src/glx/Makefile \ - $(DIRECTORY)/src/glx/mini/*.[ch] \ - $(DIRECTORY)/src/glx/mini/example.miniglx.conf \ - $(DIRECTORY)/src/glx/mini/NOTES \ - $(DIRECTORY)/src/mesa/drivers/dri/Makefile \ - $(DIRECTORY)/src/mesa/drivers/dri/Makefile.template \ - $(DIRECTORY)/src/mesa/drivers/dri/common/*.[ch] \ - $(DIRECTORY)/src/mesa/drivers/dri/dri_client/imports/*.h \ - $(DIRECTORY)/src/mesa/drivers/dri/*/*.[ch] \ - $(DIRECTORY)/src/mesa/drivers/dri/*/depend \ - $(DIRECTORY)/src/mesa/drivers/dri/*/Makefile \ - $(DIRECTORY)/src/mesa/drivers/dri/*/Doxyfile \ - $(DIRECTORY)/src/mesa/drivers/dri/*/server/*.[ch] +DEPEND_FILES = \ + $(TOP)/src/mesa/depend \ + $(TOP)/src/glw/depend \ + $(TOP)/src/glut/glx/depend \ + $(TOP)/src/glu/sgi/depend +LIB_FILES = $(MAIN_FILES) $(DRI_FILES) $(SGI_GLU_FILES) $(GLW_FILES) + + # Everything for new a Mesa release: -tarballs: lib_gz demo_gz lib_bz2 demo_bz2 lib_zip demo_zip md5 +tarballs: rm_depend lib_gz demo_gz glut_gz lib_bz2 demo_bz2 glut_bz2 lib_zip demo_zip glut_zip md5 +rm_depend: + @for dep in $(DEPEND_FILES) ; do \ + rm -f $$dep ; \ + touch $$dep ; \ + done + lib_gz: rm -f configs/current ; \ cd .. ; \ - tar -cvf $(LIB_NAME).tar $(LIB_FILES) ; \ + tar -cf $(LIB_NAME).tar $(LIB_FILES) ; \ gzip $(LIB_NAME).tar ; \ mv $(LIB_NAME).tar.gz $(DIRECTORY) demo_gz: cd .. ; \ - tar -cvf $(DEMO_NAME).tar $(DEMO_FILES) ; \ + tar -cf $(DEMO_NAME).tar $(DEMO_FILES) ; \ gzip $(DEMO_NAME).tar ; \ mv $(DEMO_NAME).tar.gz $(DIRECTORY) +glut_gz: + cd .. ; \ + tar -cf $(GLUT_NAME).tar $(GLUT_FILES) ; \ + gzip $(GLUT_NAME).tar ; \ + mv $(GLUT_NAME).tar.gz $(DIRECTORY) + lib_bz2: rm -f configs/current ; \ cd .. ; \ - tar -cvf $(LIB_NAME).tar $(LIB_FILES) ; \ + tar -cf $(LIB_NAME).tar $(LIB_FILES) ; \ bzip2 $(LIB_NAME).tar ; \ mv $(LIB_NAME).tar.bz2 $(DIRECTORY) demo_bz2: cd .. ; \ - tar -cvf $(DEMO_NAME).tar $(DEMO_FILES) ; \ + tar -cf $(DEMO_NAME).tar $(DEMO_FILES) ; \ bzip2 $(DEMO_NAME).tar ; \ mv $(DEMO_NAME).tar.bz2 $(DIRECTORY) +glut_bz2: + cd .. ; \ + tar -cf $(GLUT_NAME).tar $(GLUT_FILES) ; \ + bzip2 $(GLUT_NAME).tar ; \ + mv $(GLUT_NAME).tar.bz2 $(DIRECTORY) + lib_zip: rm -f configs/current ; \ - -rm $(LIB_NAME).zip ; \ + rm -f $(LIB_NAME).zip ; \ cd .. ; \ - zip -r $(LIB_NAME).zip $(LIB_FILES) ; \ + zip -qr $(LIB_NAME).zip $(LIB_FILES) ; \ mv $(LIB_NAME).zip $(DIRECTORY) demo_zip: - -rm $(DEMO_NAME).zip ; \ + rm -f $(DEMO_NAME).zip ; \ cd .. ; \ - zip -r $(DEMO_NAME).zip $(DEMO_FILES) ; \ + zip -qr $(DEMO_NAME).zip $(DEMO_FILES) ; \ mv $(DEMO_NAME).zip $(DIRECTORY) +glut_zip: + rm -f $(GLUT_NAME).zip ; \ + cd .. ; \ + zip -qr $(GLUT_NAME).zip $(GLUT_FILES) ; \ + mv $(GLUT_NAME).zip $(DIRECTORY) + md5: @-md5sum $(LIB_NAME).tar.gz @-md5sum $(LIB_NAME).tar.bz2 @@ -374,3 +445,6 @@ @-md5sum $(DEMO_NAME).tar.gz @-md5sum $(DEMO_NAME).tar.bz2 @-md5sum $(DEMO_NAME).zip + @-md5sum $(GLUT_NAME).tar.gz + @-md5sum $(GLUT_NAME).tar.bz2 + @-md5sum $(GLUT_NAME).zip _____ Modified: vendor/Mesa3D/current/Makefile.DJ --- vendor/Mesa3D/current/Makefile.DJ 2005-11-04 16:26:13 UTC (rev 18996) +++ vendor/Mesa3D/current/Makefile.DJ 2005-11-04 16:36:25 UTC (rev 18997) @@ -20,9 +20,9 @@ # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# DOS/DJGPP makefile v1.5 for Mesa +# DOS/DJGPP makefile v1.6 for Mesa # -# Copyright (C) 2002 - Borca Daniel +# Copyright (C) 2002 - Daniel Borca # Email : dborca(a)users.sourceforge.net # Web : http://www.geocities.com/dborca @@ -31,8 +31,6 @@ # Available options: # # Environment variables: -# CPU optimize for the given processor. -# default = pentium # GLU=[mesa|sgi] specify GLU directory; can be `sgi' (requires GNU/C++) # or `mesa'. # default = mesa @@ -59,12 +57,10 @@ .PHONY : all libgl libglu libglut clean realclean -CPU ?= pentium - GLU ?= mesa CFLAGS = -Wall -W -pedantic -CFLAGS += -O2 -ffast-math -mcpu=$(CPU) +CFLAGS += -O2 -ffast-math export CFLAGS _____ Modified: vendor/Mesa3D/current/Makefile.mgw --- vendor/Mesa3D/current/Makefile.mgw 2005-11-04 16:26:13 UTC (rev 18996) +++ vendor/Mesa3D/current/Makefile.mgw 2005-11-04 16:36:25 UTC (rev 18997) @@ -20,9 +20,9 @@ # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# MinGW makefile v1.1 for Mesa +# MinGW makefile v1.2 for Mesa # -# Copyright (C) 2002 - Borca Daniel +# Copyright (C) 2002 - Daniel Borca # Email : dborca(a)users.sourceforge.net # Web : http://www.geocities.com/dborca @@ -31,8 +31,6 @@ # Available options: # # Environment variables: -# CPU optimize for the given processor. -# default = pentium # GLIDE path to Glide3 SDK; used with FX. # default = $(TOP)/glide3 # FX=1 build for 3dfx Glide3. Note that this disables @@ -57,8 +55,6 @@ .PHONY : all libgl clean realclean -CPU ?= pentium - ifeq ($(ICD),1) # when -std=c99 mingw will not define WIN32 CFLAGS = -Wall -W -Werror @@ -66,7 +62,7 @@ # I love c89 CFLAGS = -Wall -W -pedantic endif -CFLAGS += -O2 -ffast-math -mcpu=$(CPU) +CFLAGS += -O2 -ffast-math export CFLAGS _____ Deleted: vendor/Mesa3D/current/Mesa.dsw --- vendor/Mesa3D/current/Mesa.dsw 2005-11-04 16:26:13 UTC (rev 18996) +++ vendor/Mesa3D/current/Mesa.dsw 2005-11-04 16:36:25 UTC (rev 18997) @@ -1,179 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -####################################################################### ######## - -Project: "array_cache"=".\SRC\MESA\array_cache\array_cache.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -####################################################################### ######## - -Project: "gdi"=".\src\mesa\drivers\windows\gdi\gdi.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name array_cache - End Project Dependency - Begin Project Dependency - Project_Dep_Name main - End Project Dependency - Begin Project Dependency - Project_Dep_Name math - End Project Dependency - Begin Project Dependency - Project_Dep_Name swrast_setup - End Project Dependency - Begin Project Dependency - Project_Dep_Name swrast - End Project Dependency - Begin Project Dependency - Project_Dep_Name tnl - End Project Dependency - Begin Project Dependency - Project_Dep_Name glapi - End Project Dependency - Begin Project Dependency - Project_Dep_Name shader - End Project Dependency -}}} - -####################################################################### ######## - -Project: "glapi"=".\SRC\MESA\glapi\glapi.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -####################################################################### ######## - -Project: "glu"=".\src\glu\sgi\glu.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name gdi - End Project Dependency -}}} - -####################################################################### ######## - -Project: "main"=".\SRC\MESA\main\main.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -####################################################################### ######## - -Project: "math"=".\SRC\MESA\math\math.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -####################################################################### ######## - -Project: "osmesa"=".\SRC\MESA\DRIVERS\osmesa\osmesa.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name gdi - End Project Dependency -}}} - -####################################################################### ######## - -Project: "shader"=".\SRC\MESA\shader\shader.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -####################################################################### ######## - -Project: "swrast"=".\SRC\MESA\swrast\swrast.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -####################################################################### ######## - -Project: "swrast_setup"=".\SRC\MESA\swrast_setup\swrast_setup.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -####################################################################### ######## - -Project: "tnl"=".\SRC\MESA\tnl\tnl.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -####################################################################### ######## - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -####################################################################### ######## - _____ Modified: vendor/Mesa3D/current/bin/installmesa --- vendor/Mesa3D/current/bin/installmesa 2005-11-04 16:26:13 UTC (rev 18996) +++ vendor/Mesa3D/current/bin/installmesa 2005-11-04 16:36:25 UTC (rev 18997) @@ -12,7 +12,7 @@ INCLUDE_DIR="/usr/local/include" LIB_DIR="/usr/local/lib" - +if [ "x$#" = "x0" ] ; then echo echo "***** Mesa installation - You may need root privileges to do this *****" echo @@ -20,7 +20,7 @@ echo "Enter new directory or press <Enter> to accept this default." read INPUT -if [ x${INPUT} != "x" ] ; then +if [ "x${INPUT}" != "x" ] ; then INCLUDE_DIR=${INPUT} fi @@ -29,11 +29,10 @@ echo "Enter new directory or press <Enter> to accept this default." read INPUT -if [ x${INPUT} != "x" ] ; then +if [ "x${INPUT}" != "x" ] ; then LIB_DIR=${INPUT} fi - echo echo "About to install Mesa header files (GL/*.h) in: " ${INCLUDE_DIR}/GL echo "and Mesa library files (libGL.*, etc) in: " ${LIB_DIR} @@ -41,17 +40,30 @@ read INPUT +else +INCLUDE_DIR=$1/include +LIB_DIR=$1/lib +fi # flags: # -f = force -# -d = preserve symlinks +# -d = preserve symlinks (does not work on BSD) +if [ `uname` = "FreeBSD" ] ; then + CP_FLAGS="-f" +else + CP_FLAGS="-fd" +fi + + set -v mkdir ${INCLUDE_DIR} mkdir ${INCLUDE_DIR}/GL +mkdir ${INCLUDE_DIR}/GLES mkdir ${LIB_DIR} cp -f ${TOP}/include/GL/*.h ${INCLUDE_DIR}/GL -cp -fd ${TOP}/lib*/lib* ${LIB_DIR} +# NOT YET: cp -f ${TOP}/include/GLES/*.h ${INCLUDE_DIR}/GLES +cp ${CP_FLAGS} ${TOP}/lib*/lib* ${LIB_DIR} echo "Done." _____ Modified: vendor/Mesa3D/current/bin/mklib --- vendor/Mesa3D/current/bin/mklib 2005-11-04 16:26:13 UTC (rev 18996) +++ vendor/Mesa3D/current/bin/mklib 2005-11-04 16:36:25 UTC (rev 18997) @@ -1,37 +1,28 @@ #!/bin/sh # Make a shared library. -# Basically do a switch/case depending on the OS and make a shared (or static) -# library conforming to that OS. +# This script should be useful for projects other than Mesa. +# Improvements/fixes are welcome. -# Usage: -# mklib [options] objects ... -# Options: -# -o LIBRARY specifies the name of resulting library -# ("-o GL" for example, might result in "libGL.so" being made) -# -major N specifies major version number (default is 1) -# -minor N specifies minor version number (default is 0) -# -patch N specifies patch version number (default is 0) -# -lLIBRARY specifies a dependency on LIBRARY -# -LDIR search in DIR for library dependencies -# -cplusplus link with C++ runtime -# -static make a static library (default is dynamic/shared) -# -install DIR move resulting library file(s) to DIR -# -arch ARCH override using `uname` to determine architecture -# -archopt OPT specify an extra achitecture-specific option OPT -# -noprefix don't prefix library name with "lib" or any suffix +# Copyright (C) 1999-2005 Brian Paul All Rights Reserved. # -# The library name should just be "GL" or "GLU", etc. The 'lib' prefix -# will be added here if needed, as well as the ".so" or ".a" suffix, -# etc (unless the -noprefix option is used). +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: # -# objects should be: foo.o bar.o etc.o +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. # -# Environment variables recognized: -# CC C compiler command -# CXX C++ compiler command -# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # @@ -42,12 +33,14 @@ MINOR=0 PATCH="" DEPS="" +LINK="" CPLUSPLUS=0 STATIC=0 INSTALLDIR="." ARCH="auto" ARCHOPT="" NOPREFIX=0 +EXPORTS="" # @@ -56,25 +49,93 @@ while true do case $1 in - '-o') shift 1; LIBNAME=$1;; - '-major') shift 1; MAJOR=$1;; - '-minor') shift 1; MINOR=$1;; - '-patch') shift 1; PATCH=$1;; - -l*) DEPS="$DEPS $1";; - -L*) DEPS="$DEPS $1";; - '-cplusplus') CPLUSPLUS=1;; - '-static') STATIC=1;; - '-install') shift 1; INSTALLDIR=$1;; - '-arch') shift 1; ARCH=$1;; - '-archopt') shift 1; ARCHOPT=$1;; - '-noprefix') NOPREFIX=1;; - -*) echo "mklib: Unknown option: " $1 ; exit 1;; - *) break + '-h' | '--help') + echo 'Usage: mklib [options] objects' + echo 'Create a shared library from object files.' + echo ' -o LIBRARY specifies the name of the resulting library, without' + echo ' the leading "lib" or any suffix.' + echo ' (eg: "-o GL" might result in "libGL.so" being made)' + echo ' -major N specifies major version number (default is 1)' + echo ' -minor N specifies minor version number (default is 0)' + echo ' -patch N specifies patch version number (default is 0)' + echo ' -lLIBRARY specifies a dependency on LIBRARY' + echo ' -LDIR search in DIR for library dependencies' + echo ' -linker L explicity specify the linker program to use (eg: gcc, g++)' + echo ' Not observed on all systems at this time.' + echo ' -cplusplus link with C++ runtime' + echo ' -static make a static library (default is dynamic/shared)' + echo ' -install DIR put resulting library file(s) in DIR' + echo ' -arch ARCH override using `uname` to determine host system' + echo ' -archopt OPT specify an extra achitecture-specific option OPT' + echo " -noprefix don't prefix library name with 'lib' nor add any suffix" + echo ' -exports FILE only export the symbols listed in FILE' + echo ' -h, --help display this information and exit' + exit 1 + ;; + '-o') + shift 1; + LIBNAME=$1 + ;; + '-major') + shift 1; + MAJOR=$1 + ;; + '-minor') + shift 1; + MINOR=$1 + ;; + '-patch') + shift 1; + PATCH=$1 + ;; + '-linker') + shift 1; + LINK=$1 + ;; + -l*) + DEPS="$DEPS $1" + ;; + -L*) + DEPS="$DEPS $1" + ;; + '-cplusplus') + CPLUSPLUS=1 + ;; + '-static') + STATIC=1 + ;; + '-install') + shift 1; + INSTALLDIR=$1 + ;; + '-arch') + shift 1; + ARCH=$1 + ;; + '-archopt') + shift 1; + ARCHOPT=$1 + ;; + '-noprefix') + NOPREFIX=1 + ;; + '-exports') + shift 1; + EXPORTS=$1 + ;; + -*) + echo "mklib: Unknown option: " $1 ; + exit 1 + ;; + *) + # This should be the first object file, stop parsing + break esac shift 1 done OBJECTS=$@ + if [ ${ARCH} = "auto" ] ; then ARCH=`uname` fi @@ -104,6 +165,7 @@ echo MINOR is $MINOR echo PATCH is $PATCH echo DEPS are $DEPS + echo "EXPORTS in" $EXPORTS echo "-----------------" fi @@ -114,20 +176,32 @@ case $ARCH in 'Linux' | 'OpenBSD') - # GCC-based environment + # we assume gcc + if [ "x$LINK" = "x" ] ; then + # -linker was not specified so set default link command now + if [ $CPLUSPLUS = 1 ] ; then + LINK=g++ + else + LINK=gcc + fi + fi + if [ $NOPREFIX = 1 ] ; then # No "lib" or ".so" part echo "mklib: Making" $ARCH "shared library: " ${LIBNAME} #OPTS="-shared -Wl,-soname,${LIBNAME}" # soname??? OPTS="-shared" - if [ $CPLUSPLUS = 1 ] ; then - LINK=$CXX - else - LINK=$CC - fi + + # Check if objects are 32-bit and we're running in 64-bit + # environment. If so, pass -m32 flag to linker. + set ${OBJECTS} + ABI32=`file $1 | grep 32-bit` + if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then + OPTS="-m32 ${OPTS}" + fi + rm -f ${LIBNAME} - # make lib ${LINK} ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS} # finish up @@ -149,6 +223,27 @@ else [truncated at 1000 lines; 498025 more skipped]

1 0

[greatlrd] 18996: Never, Never do if (FALSE) it will make dead code. activate dead code after DrFreds bug.
by greatlrd＠svn.reactos.com 04 Nov '05

04 Nov '05

Never, Never do if (FALSE) it will make dead code. activate dead code after DrFreds bug. Modified: trunk/reactos/lib/ddraw/main/ddraw_main.c Modified: trunk/reactos/lib/ddraw/rosdraw.h _____ Modified: trunk/reactos/lib/ddraw/main/ddraw_main.c --- trunk/reactos/lib/ddraw/main/ddraw_main.c 2005-11-04 16:02:23 UTC (rev 18995) +++ trunk/reactos/lib/ddraw/main/ddraw_main.c 2005-11-04 16:26:13 UTC (rev 18996) @@ -16,13 +16,14 @@ IDirectDrawImpl* This = (IDirectDrawImpl*)iface; HRESULT ret; - // this if it is not called by DirectDrawCreate - if(FALSE) + if (This->InitializeDraw == TRUE) return DDERR_ALREADYINITIALIZED; - // save the parameter - This->lpGUID = lpGUID; + This->InitializeDraw = TRUE; + + + // get the HDC This->hdc = GetWindowDC(GetDesktopWindow()); This->Height = GetDeviceCaps(This->hdc, VERTRES); _____ Modified: trunk/reactos/lib/ddraw/rosdraw.h --- trunk/reactos/lib/ddraw/rosdraw.h 2005-11-04 16:02:23 UTC (rev 18995) +++ trunk/reactos/lib/ddraw/rosdraw.h 2005-11-04 16:26:13 UTC (rev 18996) @@ -28,7 +28,8 @@ HDC hdc; int Height, Width, Bpp; - GUID* lpGUID; + GUID InGUID; + BOOL InitializeDraw; } IDirectDrawImpl;

1 0

[blight] 18995: Damn, I misunderstood GvG and did something wrong, following his advice now to fix things.
by blight＠svn.reactos.com 04 Nov '05

04 Nov '05

Damn, I misunderstood GvG and did something wrong, following his advice now to fix things. Deleted: vendor/Mesa3D/Mesa-6.2/current/ Added: vendor/Mesa3D/current/ _____ Copied: vendor/Mesa3D/current (from rev 18994, vendor/Mesa3D/Mesa-6.2/current)

1 0

[blight] 18994: Delete current Mesa3D (Mesa-6.2)
by blight＠svn.reactos.com 04 Nov '05

04 Nov '05

Delete current Mesa3D (Mesa-6.2) Deleted: vendor/Mesa3D/current/

1 0

[blight] 18993: Copy current Mesa to Mesa-6.2
by blight＠svn.reactos.com 04 Nov '05

04 Nov '05

Copy current Mesa to Mesa-6.2 Added: vendor/Mesa3D/Mesa-6.2/current/ _____ Copied: vendor/Mesa3D/Mesa-6.2/current (from rev 18992, vendor/Mesa3D/current)

1 0

[blight] 18992: Set svn:eol-style to native.
by blight＠svn.reactos.com 04 Nov '05

04 Nov '05

Set svn:eol-style to native. Property changes on: trunk/reactos/lib/mesa32/README.ReactOS ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/mesa32/src/Makefile.DJ ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/mesa32/src/Makefile.mgw ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/mesa32/src/array_cache/array_cache.dsp ___________________________________________________________________ Name: svn:eol-style - CRLF + native Property changes on: trunk/reactos/lib/mesa32/src/array_cache/descrip.mms ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/mesa32/src/depend ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/mesa32/src/descrip.mms ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/mesa32/src/drivers/common/descrip.mms ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/mesa32/src/drivers/ggi/default/genkgi.conf.in ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/mesa32/src/drivers/ggi/display/fbdev.conf.in ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/mesa32/src/drivers/ggi/ggimesa.conf.in ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/mesa32/src/drivers/osmesa/Makefile.win ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/mesa32/src/drivers/osmesa/descrip.mms ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/mesa32/src/drivers/osmesa/osmesa.dsp ___________________________________________________________________ Name: svn:eol-style - CRLF + native Property changes on: trunk/reactos/lib/mesa32/src/drivers/windows/gdi/gdi.dsp ___________________________________________________________________ Name: svn:eol-style - CRLF + native Property changes on: trunk/reactos/lib/mesa32/src/drivers/x11/descrip.mms ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/mesa32/src/glapi/descrip.mms ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/mesa32/src/glapi/glapi.dsp ___________________________________________________________________ Name: svn:eol-style - CRLF + native Property changes on: trunk/reactos/lib/mesa32/src/main/descrip.mms ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/mesa32/src/main/main.dsp ___________________________________________________________________ Name: svn:eol-style - CRLF + native Property changes on: trunk/reactos/lib/mesa32/src/math/descrip.mms ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/mesa32/src/math/math.dsp ___________________________________________________________________ Name: svn:eol-style - CRLF + native Property changes on: trunk/reactos/lib/mesa32/src/shader/descrip.mms ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/mesa32/src/shader/shader.dsp ___________________________________________________________________ Name: svn:eol-style - CRLF + native Property changes on: trunk/reactos/lib/mesa32/src/sources ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/mesa32/src/swrast/descrip.mms ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/mesa32/src/swrast/swrast.dsp ___________________________________________________________________ Name: svn:eol-style - CRLF + native Property changes on: trunk/reactos/lib/mesa32/src/swrast_setup/descrip.mms ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/mesa32/src/swrast_setup/swrast_setup.dsp ___________________________________________________________________ Name: svn:eol-style - CRLF + native Property changes on: trunk/reactos/lib/mesa32/src/tnl/descrip.mms ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/mesa32/src/tnl/tnl.dsp ___________________________________________________________________ Name: svn:eol-style - CRLF + native Property changes on: trunk/reactos/lib/mesa32/src/tnl_dd/imm/NOTES.imm ___________________________________________________________________ Name: svn:eol-style + native

1 0

[blight] 18991: Put back reactos specific changes from old mesa32 directory.
by blight＠svn.reactos.com 04 Nov '05

04 Nov '05

Put back reactos specific changes from old mesa32 directory. Added: trunk/reactos/lib/mesa32/README.ReactOS Modified: trunk/reactos/lib/mesa32/include/GL/gl.h Modified: trunk/reactos/lib/mesa32/include/GL/mesa_wgl.h Modified: trunk/reactos/lib/mesa32/include/GL/wmesa.h Added: trunk/reactos/lib/mesa32/mesa32.def Added: trunk/reactos/lib/mesa32/mesa32.xml Modified: trunk/reactos/lib/mesa32/src/drivers/windows/gdi/wmesa.c Modified: trunk/reactos/lib/mesa32/src/drivers/windows/gdi/wmesadef.h Modified: trunk/reactos/lib/mesa32/src/main/glheader.h Modified: trunk/reactos/lib/mesa32/src/main/texcompress_s3tc.c Modified: trunk/reactos/lib/mesa32/src/main/texformat_tmp.h Modified: trunk/reactos/lib/mesa32/src/x86/common_x86.c Modified: trunk/reactos/lib/mesa32/src/x86/glapi_x86.S _____ Added: trunk/reactos/lib/mesa32/README.ReactOS --- trunk/reactos/lib/mesa32/README.ReactOS 2005-11-04 14:25:07 UTC (rev 18990) +++ trunk/reactos/lib/mesa32/README.ReactOS 2005-11-04 14:52:02 UTC (rev 18991) @@ -0,0 +1,8 @@ +This is Mesa-6.2 (http://www.mesa3d.org/) with an ICD interface. + +The ICD functions are in src/drivers/windows/icd/icd.c +I have created a new Makefile for ReactOS which will build Mesa with the ICD +interface. I have not adjusted the Visual C++ project/workspace files. + + --blight + _____ Modified: trunk/reactos/lib/mesa32/include/GL/gl.h --- trunk/reactos/lib/mesa32/include/GL/gl.h 2005-11-04 14:25:07 UTC (rev 18990) +++ trunk/reactos/lib/mesa32/include/GL/gl.h 2005-11-04 14:52:02 UTC (rev 18991) @@ -53,9 +53,9 @@ #endif #if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__)) -# if defined(_MSC_VER) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */ +# if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */ # define GLAPI __declspec(dllexport) -# elif defined(_MSC_VER) && defined(_DLL) /* tag specifying we're building for DLL runtime support */ +# elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) /* tag specifying we're building for DLL runtime support */ # define GLAPI __declspec(dllimport) # else /* for use with static link lib build of Win32 edition only */ # define GLAPI extern _____ Modified: trunk/reactos/lib/mesa32/include/GL/mesa_wgl.h --- trunk/reactos/lib/mesa32/include/GL/mesa_wgl.h 2005-11-04 14:25:07 UTC (rev 18990) +++ trunk/reactos/lib/mesa32/include/GL/mesa_wgl.h 2005-11-04 14:52:02 UTC (rev 18991) @@ -32,7 +32,7 @@ #define _mesa_wgl_h_ -#include <gl/gl.h> +#include <GL/gl.h> #ifdef __cplusplus extern "C" { @@ -40,10 +40,10 @@ #if !defined(OPENSTEP) && (defined(__WIN32__) || defined(__CYGWIN32__)) -# if defined(_MSC_VER) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */ +# if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */ # define GLAPI __declspec(dllexport) # define WGLAPI __declspec(dllexport) -# elif defined(_MSC_VER) && defined(_DLL) /* tag specifying we're building for DLL runtime support */ +# elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) /* tag specifying we're building for DLL runtime support */ # define GLAPI __declspec(dllimport) # define WGLAPI __declspec(dllimport) # else /* for use with static link lib build of Win32 edition only */ _____ Modified: trunk/reactos/lib/mesa32/include/GL/wmesa.h --- trunk/reactos/lib/mesa32/include/GL/wmesa.h 2005-11-04 14:25:07 UTC (rev 18990) +++ trunk/reactos/lib/mesa32/include/GL/wmesa.h 2005-11-04 14:52:02 UTC (rev 18991) @@ -50,7 +50,7 @@ #endif -#include "gl\gl.h" +#include "GL/gl.h" #if defined(_MSV_VER) && !defined(__GNUC__) # pragma warning (disable:4273) _____ Added: trunk/reactos/lib/mesa32/mesa32.def --- trunk/reactos/lib/mesa32/mesa32.def 2005-11-04 14:25:07 UTC (rev 18990) +++ trunk/reactos/lib/mesa32/mesa32.def 2005-11-04 14:52:02 UTC (rev 18991) @@ -0,0 +1,110 @@ +DESCRIPTION 'Mesa (OpenGL driver) for Win32' +VERSION 6.1 + +EXPORTS +; +; ICD API + DrvCopyContext + DrvCreateContext + DrvCreateLayerContext + DrvDeleteContext + DrvDescribeLayerPlane + DrvDescribePixelFormat + DrvGetLayerPaletteEntries + DrvGetProcAddress + DrvReleaseContext + DrvRealizeLayerPalette + DrvSetContext + DrvSetLayerPaletteEntries + DrvSetPixelFormat + DrvShareLists + DrvSwapBuffers + DrvSwapLayerBuffers + DrvValidateVersion + +; +; Mesa internals - mostly for OSMESA + _ac_CreateContext + _ac_DestroyContext + _ac_InvalidateState + _glapi_get_context + _glapi_get_proc_address + _mesa_buffer_data + _mesa_buffer_map + _mesa_buffer_subdata + _mesa_bzero + _mesa_calloc + _mesa_choose_tex_format + _mesa_compressed_texture_size + _mesa_create_framebuffer + _mesa_create_visual + _mesa_delete_buffer_object + _mesa_delete_texture_object + _mesa_destroy_framebuffer + _mesa_destroy_visual + _mesa_enable_1_3_extensions + _mesa_enable_1_4_extensions + _mesa_enable_1_5_extensions + _mesa_enable_sw_extensions + _mesa_error + _mesa_free + _mesa_free_context_data + _mesa_get_current_context + _mesa_init_default_imports + _mesa_init_driver_functions + _mesa_initialize_context + _mesa_make_current + _mesa_memcpy + _mesa_memset + _mesa_new_buffer_object + _mesa_new_texture_object + _mesa_problem + _mesa_ResizeBuffersMESA + _mesa_store_compressed_teximage1d + _mesa_store_compressed_teximage2d + _mesa_store_compressed_teximage3d + _mesa_store_compressed_texsubimage1d + _mesa_store_compressed_texsubimage2d + _mesa_store_compressed_texsubimage3d + _mesa_store_teximage1d + _mesa_store_teximage2d + _mesa_store_teximage3d + _mesa_store_texsubimage1d + _mesa_store_texsubimage2d + _mesa_store_texsubimage3d + _mesa_strcmp + _mesa_test_proxy_teximage + _mesa_Viewport + _swrast_Accum + _swrast_alloc_buffers + _swrast_Bitmap + _swrast_CopyPixels + _swrast_DrawBuffer + _swrast_DrawPixels + _swrast_GetDeviceDriverReference + _swrast_Clear + _swrast_choose_line + _swrast_choose_triangle + _swrast_CopyColorSubTable + _swrast_CopyColorTable + _swrast_CopyConvolutionFilter1D + _swrast_CopyConvolutionFilter2D + _swrast_copy_teximage1d + _swrast_copy_teximage2d + _swrast_copy_texsubimage1d + _swrast_copy_texsubimage2d + _swrast_copy_texsubimage3d + _swrast_CreateContext + _swrast_DestroyContext + _swrast_InvalidateState + _swrast_ReadPixels + _swrast_zbuffer_address + _swsetup_Wakeup + _swsetup_CreateContext + _swsetup_DestroyContext + _swsetup_InvalidateState + _tnl_CreateContext + _tnl_DestroyContext + _tnl_InvalidateState + _tnl_MakeCurrent + _tnl_run_pipeline Property changes on: trunk/reactos/lib/mesa32/mesa32.def ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/lib/mesa32/mesa32.xml --- trunk/reactos/lib/mesa32/mesa32.xml 2005-11-04 14:25:07 UTC (rev 18990) +++ trunk/reactos/lib/mesa32/mesa32.xml 2005-11-04 14:52:02 UTC (rev 18991) @@ -0,0 +1,209 @@ +<module name="mesa32" type="win32dll" baseaddress="${BASEADDRESS_MESA32}" installbase="system32" installname="mesa32.dll" allowwarnings="true"> + <importlibrary definition="mesa32.def" /> + <linkerflag>-Wl,--enable-stdcall-fixup</linkerflag> + <include base="mesa32">include</include> + <include base="mesa32">src</include> + <include base="mesa32">src/main</include> + <include base="mesa32">src/glapi</include> + <include base="mesa32">src/math</include> + <include base="mesa32">src/tnl</include> + <include base="mesa32">src/shader</include> + <include base="mesa32">src/swrast</include> + <include base="mesa32">src/swrast_setup</include> + <define name="BUILD_GL32" /> + <define name="_OPENGL32_" /> + <define name="STDCALL_API" /> + <define name="USE_MGL_NAMESPACE" /> + <define name="USE_X86_ASM" /> + <define name="USE_MMX_ASM" /> + <define name="USE_SSE_ASM" /> + <define name="USE_3DNOW_ASM" /> + <define name="__USE_W32API" /> + <library>ntdll</library> + <library>kernel32</library> + <library>gdi32</library> + <directory name="src"> + <directory name="array_cache"> + <file>ac_context.c</file> + <file>ac_import.c</file> + </directory> + <directory name="drivers"> + <directory name="common"> + <file>driverfuncs.c</file> + </directory> + <directory name="windows"> + <directory name="gdi"> + <file>wmesa.c</file> + </directory> + <directory name="icd"> + <file>icd.c</file> + </directory> + </directory> + </directory> + <directory name="glapi"> + <file>glapi.c</file> + <file>glthread.c</file> + </directory> + <directory name="main"> + <file>api_arrayelt.c</file> + <file>api_loopback.c</file> + <file>api_noop.c</file> + <file>api_validate.c</file> + <file>accum.c</file> + <file>attrib.c</file> + <file>blend.c</file> + <file>bufferobj.c</file> + <file>buffers.c</file> + <file>clip.c</file> + <file>colortab.c</file> + <file>context.c</file> + <file>convolve.c</file> + <file>debug.c</file> + <file>depth.c</file> + <file>dispatch.c</file> + <file>dlist.c</file> + <file>drawpix.c</file> + <file>enable.c</file> + <file>enums.c</file> + <file>eval.c</file> + <file>extensions.c</file> + <file>feedback.c</file> + <file>fog.c</file> + <file>get.c</file> + <file>hash.c</file> + <file>hint.c</file> + <file>histogram.c</file> + <file>image.c</file> + <file>imports.c</file> + <file>light.c</file> + <file>lines.c</file> + <file>matrix.c</file> + <file>occlude.c</file> + <file>pixel.c</file> + <file>points.c</file> + <file>polygon.c</file> + <file>rastpos.c</file> + <file>state.c</file> + <file>stencil.c</file> + <file>texcompress.c</file> + <file>texcompress_s3tc.c</file> + <file>texcompress_fxt1.c</file> + <file>texformat.c</file> + <file>teximage.c</file> + <file>texobj.c</file> + <file>texstate.c</file> + <file>texstore.c</file> + <file>varray.c</file> + <file>vtxfmt.c</file> + </directory> + <directory name="math"> + <file>m_debug_clip.c</file> + <file>m_debug_norm.c</file> + <file>m_debug_xform.c</file> + <file>m_eval.c</file> + <file>m_matrix.c</file> + <file>m_translate.c</file> + <file>m_vector.c</file> + <file>m_xform.c</file> + </directory> + <directory name="swrast"> + <file>s_fragprog_to_c.c</file> + <file>s_aaline.c</file> + <file>s_aatriangle.c</file> + <file>s_accum.c</file> + <file>s_alpha.c</file> + <file>s_alphabuf.c</file> + <file>s_auxbuffer.c</file> + <file>s_bitmap.c</file> + <file>s_blend.c</file> + <file>s_buffers.c</file> + <file>s_copypix.c</file> + <file>s_context.c</file> + <file>s_depth.c</file> + <file>s_drawpix.c</file> + <file>s_feedback.c</file> + <file>s_fog.c</file> + <file>s_imaging.c</file> + <file>s_lines.c</file> + <file>s_logic.c</file> + <file>s_masking.c</file> + <file>s_nvfragprog.c</file> + <file>s_pixeltex.c</file> + <file>s_points.c</file> + <file>s_readpix.c</file> + <file>s_span.c</file> + <file>s_stencil.c</file> + <file>s_tcc.c</file> + <file>s_texture.c</file> + <file>s_texstore.c</file> + <file>s_triangle.c</file> + <file>s_zoom.c</file> + </directory> + <directory name="swrast_setup"> + <file>ss_context.c</file> + <file>ss_triangle.c</file> + </directory> + <directory name="shader"> + <file>arbfragparse.c</file> + <file>arbprogparse.c</file> + <file>arbprogram.c</file> + <file>arbvertparse.c</file> + <file>grammar_mesa.c</file> + <file>nvfragparse.c</file> + <file>nvprogram.c</file> + <file>nvvertexec.c</file> + <file>nvvertparse.c</file> + <file>program.c</file> + </directory> + <directory name="tnl"> + <file>t_array_api.c</file> + <file>t_array_import.c</file> + <file>t_context.c</file> + <file>t_pipeline.c</file> + <file>t_save_api.c</file> + <file>t_save_loopback.c</file> + <file>t_save_playback.c</file> + <file>t_vb_fog.c</file> + <file>t_vb_light.c</file> + <file>t_vb_normals.c</file> + <file>t_vb_points.c</file> + <file>t_vb_program.c</file> + <file>t_vb_render.c</file> + <file>t_vb_texgen.c</file> + <file>t_vb_texmat.c</file> + <file>t_vb_vertex.c</file> + <file>t_vertex.c</file> + <file>t_vertex_c.c</file> + <file>t_vertex_codegen.c</file> + <file>t_vtx_api.c</file> + <file>t_vtx_generic.c</file> + <file>t_vtx_eval.c</file> + <file>t_vtx_exec.c</file> + <file>t_vtx_x86.c</file> + <file>t_vtx_x86_gcc.S</file> + </directory> + <directory name="x86"> + <file>3dnow.c</file> + <file>3dnow_normal.S</file> + <file>3dnow_xform1.S</file> + <file>3dnow_xform2.S</file> + <file>3dnow_xform3.S</file> + <file>3dnow_xform4.S</file> + <file>common_x86.c</file> + <file>common_x86_asm.S</file> + <file>glapi_x86.S</file> + <file>mmx_blend.S</file> + <file>sse.c</file> + <file>sse_normal.S</file> + <file>sse_xform1.S</file> + <file>sse_xform2.S</file> + <file>sse_xform3.S</file> + <file>sse_xform4.S</file> + <file>x86.c</file> + <file>x86_xform2.S</file> + <file>x86_xform3.S</file> + <file>x86_xform4.S</file> + <file>x86_cliptest.S</file> + </directory> + </directory> +</module> Property changes on: trunk/reactos/lib/mesa32/mesa32.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/mesa32/src/drivers/windows/gdi/wmesa.c --- trunk/reactos/lib/mesa32/src/drivers/windows/gdi/wmesa.c 2005-11-04 14:25:07 UTC (rev 18990) +++ trunk/reactos/lib/mesa32/src/drivers/windows/gdi/wmesa.c 2005-11-04 14:52:02 UTC (rev 18991) @@ -18,7 +18,7 @@ * Updated for Mesa 4.0 by Karl Schultz (kschultz(a)sourceforge.net) */ -#ifdef NDEBUG +#if defined(NDEBUG) && defined(_MSC_VER) #pragma auto_inline(on) #pragma inline_depth(255) #pragma inline_recursion(on) @@ -72,7 +72,7 @@ /* Stereo and parallel not tested for Mesa 4.0. */ #define NO_STEREO #if !defined(NO_STEREO) -#include "gl\glu.h" +#include "GL/glu.h" #include "stereo.h" #endif @@ -112,6 +112,8 @@ #if defined(_MSC_VER) && _MSC_VER >= 1200 #define FORCEINLINE __forceinline +#elif defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) +#define FORCEINLINE __attribute__((always_inline)) #else #define FORCEINLINE __inline #endif @@ -470,7 +472,7 @@ mask &= ~DD_BACK_LEFT_BIT; #endif // DDRAW #else - DWORD dwColor; + DWORD dwColor = 0; WORD wColor; BYTE bColor; LPDWORD lpdw = (LPDWORD)Current->pbPixels; @@ -521,8 +523,6 @@ GetGValue(Current->clearpixel), GetBValue(Current->clearpixel)); } - else - dwColor = 0; if (nBypp != 3) { _____ Modified: trunk/reactos/lib/mesa32/src/drivers/windows/gdi/wmesadef.h --- trunk/reactos/lib/mesa32/src/drivers/windows/gdi/wmesadef.h 2005-11-04 14:25:07 UTC (rev 18990) +++ trunk/reactos/lib/mesa32/src/drivers/windows/gdi/wmesadef.h 2005-11-04 14:52:02 UTC (rev 18991) @@ -70,7 +70,7 @@ #include <windows.h> -#include <GL\gl.h> +#include <GL/gl.h> #include "context.h" #ifdef DDRAW #define DIRECTDRAW_VERSION 0x0100 _____ Modified: trunk/reactos/lib/mesa32/src/main/glheader.h --- trunk/reactos/lib/mesa32/src/main/glheader.h 2005-11-04 14:25:07 UTC (rev 18990) +++ trunk/reactos/lib/mesa32/src/main/glheader.h 2005-11-04 14:52:02 UTC (rev 18991) @@ -98,10 +98,10 @@ # pragma warning( disable : 4761 ) /* integral size mismatch in argument; conversion supplied */ # endif # endif -# if defined(_MSC_VER) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */ +# if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */ # define GLAPI __declspec(dllexport) # define WGLAPI __declspec(dllexport) -# elif defined(_MSC_VER) && defined(_DLL) /* tag specifying we're building for DLL runtime support */ +# elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) /* tag specifying we're building for DLL runtime support */ # define GLAPI __declspec(dllimport) # define WGLAPI __declspec(dllimport) # else /* for use with static link lib build of Win32 edition only */ _____ Modified: trunk/reactos/lib/mesa32/src/main/texcompress_s3tc.c --- trunk/reactos/lib/mesa32/src/main/texcompress_s3tc.c 2005-11-04 14:25:07 UTC (rev 18990) +++ trunk/reactos/lib/mesa32/src/main/texcompress_s3tc.c 2005-11-04 14:52:02 UTC (rev 18991) @@ -286,7 +286,7 @@ GLint i, GLint j, GLint k, GLfloat *texel ) { /* just sample as GLchan and convert to float here */ - GLchan rgba[4]; + GLchan rgba[4] = {0, 0, 0, 0}; fetch_texel_2d_rgb_dxt1(texImage, i, j, k, rgba); texel[RCOMP] = CHAN_TO_FLOAT(rgba[RCOMP]); texel[GCOMP] = CHAN_TO_FLOAT(rgba[GCOMP]); @@ -308,7 +308,7 @@ GLint i, GLint j, GLint k, GLfloat *texel ) { /* just sample as GLchan and convert to float here */ - GLchan rgba[4]; + GLchan rgba[4] = {0, 0, 0, 0}; fetch_texel_2d_rgba_dxt1(texImage, i, j, k, rgba); texel[RCOMP] = CHAN_TO_FLOAT(rgba[RCOMP]); texel[GCOMP] = CHAN_TO_FLOAT(rgba[GCOMP]); @@ -330,7 +330,7 @@ GLint i, GLint j, GLint k, GLfloat *texel ) { /* just sample as GLchan and convert to float here */ - GLchan rgba[4]; + GLchan rgba[4] = {0, 0, 0, 0}; fetch_texel_2d_rgba_dxt3(texImage, i, j, k, rgba); texel[RCOMP] = CHAN_TO_FLOAT(rgba[RCOMP]); texel[GCOMP] = CHAN_TO_FLOAT(rgba[GCOMP]); @@ -352,7 +352,7 @@ GLint i, GLint j, GLint k, GLfloat *texel ) { /* just sample as GLchan and convert to float here */ - GLchan rgba[4]; + GLchan rgba[4] = {0, 0, 0, 0}; fetch_texel_2d_rgba_dxt5(texImage, i, j, k, rgba); texel[RCOMP] = CHAN_TO_FLOAT(rgba[RCOMP]); texel[GCOMP] = CHAN_TO_FLOAT(rgba[GCOMP]); _____ Modified: trunk/reactos/lib/mesa32/src/main/texformat_tmp.h --- trunk/reactos/lib/mesa32/src/main/texformat_tmp.h 2005-11-04 14:25:07 UTC (rev 18990) +++ trunk/reactos/lib/mesa32/src/main/texformat_tmp.h 2005-11-04 14:52:02 UTC (rev 18991) @@ -1,6 +1,7 @@ +/* $XFree86$ */ /* * Mesa 3-D graphics library - * Version: 6.1 + * Version: 6.2 * * Copyright (C) 1999-2004 Brian Paul All Rights Reserved. * @@ -44,46 +45,34 @@ #if DIM == 1 #define CHAN_SRC( t, i, j, k, sz ) \ - ((void) (j), (void) (k), \ - ((GLchan *)(t)->Data + (i) * (sz))) + ((GLchan *)(t)->Data + (i) * (sz)) #define UBYTE_SRC( t, i, j, k, sz ) \ - ((void) (j), (void) (k), \ - ((GLubyte *)(t)->Data + (i) * (sz))) + ((GLubyte *)(t)->Data + (i) * (sz)) #define USHORT_SRC( t, i, j, k ) \ - ((void) (j), (void) (k), \ - ((GLushort *)(t)->Data + (i))) + ((GLushort *)(t)->Data + (i)) #define UINT_SRC( t, i, j, k ) \ - ((void) (j), (void) (k), \ - ((GLuint *)(t)->Data + (i))) + ((GLuint *)(t)->Data + (i)) #define FLOAT_SRC( t, i, j, k, sz ) \ - ((void) (j), (void) (k), \ - ((GLfloat *)(t)->Data + (i) * (sz))) + ((GLfloat *)(t)->Data + (i) * (sz)) #define HALF_SRC( t, i, j, k, sz ) \ - ((void) (j), (void) (k), \ - ((GLhalfARB *)(t)->Data + (i) * (sz))) + ((GLhalfARB *)(t)->Data + (i) * (sz)) #define FETCH(x) fetch_texel_1d_##x #elif DIM == 2 #define CHAN_SRC( t, i, j, k, sz ) \ - ((void) (k), \ - ((GLchan *)(t)->Data + ((t)->RowStride * (j) + (i)) * (sz))) + ((GLchan *)(t)->Data + ((t)->RowStride * (j) + (i)) * (sz)) #define UBYTE_SRC( t, i, j, k, sz ) \ - ((void) (k), \ - ((GLubyte *)(t)->Data + ((t)->RowStride * (j) + (i)) * (sz))) + ((GLubyte *)(t)->Data + ((t)->RowStride * (j) + (i)) * (sz)) #define USHORT_SRC( t, i, j, k ) \ - ((void) (k), \ - ((GLushort *)(t)->Data + ((t)->RowStride * (j) + (i)))) + ((GLushort *)(t)->Data + ((t)->RowStride * (j) + (i))) #define UINT_SRC( t, i, j, k ) \ - ((void) (k), \ - ((GLuint *)(t)->Data + ((t)->RowStride * (j) + (i)))) + ((GLuint *)(t)->Data + ((t)->RowStride * (j) + (i))) #define FLOAT_SRC( t, i, j, k, sz ) \ - ((void) (k), \ - ((GLfloat *)(t)->Data + ((t)->RowStride * (j) + (i)) * (sz))) + ((GLfloat *)(t)->Data + ((t)->RowStride * (j) + (i)) * (sz)) #define HALF_SRC( t, i, j, k, sz ) \ - ((void) (k), \ - ((GLhalfARB *)(t)->Data + ((t)->RowStride * (j) + (i)) * (sz))) + ((GLhalfARB *)(t)->Data + ((t)->RowStride * (j) + (i)) * (sz)) #define FETCH(x) fetch_texel_2d_##x @@ -1023,9 +1012,9 @@ GLint i, GLint j, GLint k, GLchan *texel ) { const GLubyte *src = UBYTE_SRC( texImage, i, j, k, 1 ); - const GLuint index = *src; const struct gl_color_table *palette; const GLchan *table; + GLuint index; GET_CURRENT_CONTEXT(ctx); if (ctx->Texture.SharedPalette) { @@ -1039,6 +1028,9 @@ ASSERT(palette->Type != GL_FLOAT); table = (const GLchan *) palette->Table; + /* Mask the index against size of palette to avoid going out of bounds */ + index = (*src) & (palette->Size - 1); + switch (palette->Format) { case GL_ALPHA: texel[RCOMP] = _____ Modified: trunk/reactos/lib/mesa32/src/x86/common_x86.c --- trunk/reactos/lib/mesa32/src/x86/common_x86.c 2005-11-04 14:25:07 UTC (rev 18990) +++ trunk/reactos/lib/mesa32/src/x86/common_x86.c 2005-11-04 14:52:02 UTC (rev 18991) @@ -132,6 +132,36 @@ } #endif /* __linux__ && _POSIX_SOURCE && X86_FXSR_MAGIC */ +#if defined(WIN32) +#ifndef STATUS_FLOAT_MULTIPLE_TRAPS +# define STATUS_FLOAT_MULTIPLE_TRAPS (0xC00002B5L) +#endif +static LONG WINAPI ExceptionFilter(LPEXCEPTION_POINTERS exp) +{ + PEXCEPTION_RECORD rec = exp->ExceptionRecord; + PCONTEXT ctx = exp->ContextRecord; + + if ( rec->ExceptionCode == EXCEPTION_ILLEGAL_INSTRUCTION ) { + message( "EXCEPTION_ILLEGAL_INSTRUCTION, " ); + _mesa_x86_cpu_features &= ~(X86_FEATURE_XMM); + } else if ( rec->ExceptionCode == STATUS_FLOAT_MULTIPLE_TRAPS ) { + message( "STATUS_FLOAT_MULTIPLE_TRAPS, " ); + /* Windows seems to clear the exception flag itself, we just have to increment Eip */ + } else { + message( "UNEXPECTED EXCEPTION (0x%08x), terminating!" ); + return EXCEPTION_EXECUTE_HANDLER; + } + + if ( (ctx->ContextFlags & CONTEXT_CONTROL) != CONTEXT_CONTROL ) { + message( "Context does not contain control registers, terminating!" ); + return EXCEPTION_EXECUTE_HANDLER; + } + ctx->Eip += 3; + + return EXCEPTION_CONTINUE_EXECUTION; +} +#endif /* WIN32 */ + /* If we're running on a processor that can do SSE, let's see if we * are allowed to or not. This will catch 2.4.0 or later kernels that * haven't been configured for a Pentium III but are running on one, @@ -226,6 +256,44 @@ if (ret || !enabled) _mesa_x86_cpu_features &= ~(X86_FEATURE_XMM); } +#elif defined(WIN32) + LPTOP_LEVEL_EXCEPTION_FILTER oldFilter; + + /* Install our ExceptionFilter */ + oldFilter = SetUnhandledExceptionFilter( ExceptionFilter ); + + if ( cpu_has_xmm ) { + message( "Testing OS support for SSE... " ); + + _mesa_test_os_sse_support(); + + if ( cpu_has_xmm ) { + message( "yes.\n" ); + } else { + message( "no!\n" ); + } + } + + if ( cpu_has_xmm ) { + message( "Testing OS support for SSE unmasked exceptions... " ); + + _mesa_test_os_sse_exception_support(); + + if ( cpu_has_xmm ) { + message( "yes.\n" ); + } else { + message( "no!\n" ); + } + } + + /* Restore previous exception filter */ + SetUnhandledExceptionFilter( oldFilter ); + + if ( cpu_has_xmm ) { + message( "Tests of OS support for SSE passed.\n" ); + } else { + message( "Tests of OS support for SSE failed!\n" ); + } #else /* Do nothing on other platforms for now. */ _____ Modified: trunk/reactos/lib/mesa32/src/x86/glapi_x86.S --- trunk/reactos/lib/mesa32/src/x86/glapi_x86.S 2005-11-04 14:25:07 UTC (rev 18990) +++ trunk/reactos/lib/mesa32/src/x86/glapi_x86.S 2005-11-04 14:52:02 UTC (rev 18991) @@ -29,7 +29,7 @@ #include "assyntax.h" #include "glapioffsets.h" -#ifndef __WIN32__ +#if 1 //ndef __WIN32__ #if defined(STDCALL_API) # if defined(USE_MGL_NAMESPACE)

1 0

[blight] 18990: Import include directory from Mesa3D vendor drop (this time into the right directory)
by blight＠svn.reactos.com 04 Nov '05

04 Nov '05

Import include directory from Mesa3D vendor drop (this time into the right directory) Added: trunk/reactos/lib/mesa32/include/ _____ Copied: trunk/reactos/lib/mesa32/include (from rev 18989, vendor/Mesa3D/current/include)

1 0

[blight] 18989: Delete GL subdirectory (should be inside include directory, the svn copy command was wrong)
by blight＠svn.reactos.com 04 Nov '05

04 Nov '05

Delete GL subdirectory (should be inside include directory, the svn copy command was wrong) Deleted: trunk/reactos/lib/mesa32/GL/

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs