Tag 'mesa_20050526' created by Keith Whitwell <ke...@tungstengraphics.com> at 1970-01-01 00:00 +0000
Changes since mesa_20050504: Aapo Tahkola (10): Pack tex coord regs at vertex program backend. Flat shading and bunch of clarifications to r300_reg.h . Getting rusty... 4278 was already there. Missing setups that cause all kinds of problems with hw tnl. VBOs. Dont assume GLbooleans are ones when true. Make gleans polyoffset test happy. Polygon mode fixes. Stick texture LOD back on. Ditch unused code and features that arent in subject to get supported any near time. Adam Jackson (4): Add drirenderbuffer.c to COMMON_SOURCES Refactor COMMON_SOURCES up to Makefile.template int -> size_t to fix compile on LP64. Use the 1.3 names for FogCoord* Alan Hourihane (1): Remove MAX_VISUAL limitations of 100. If running dual head this can Ben Skeggs (5): Updated for EXT_framebuffer_object changes. I don't know if this is correct, but it seems to work fix warnings in r300_texstate.c (Jeff Smith) Implement enough of ARB_fragment_program for Keith's texenv program - Remove one of the loops in emit_arith constant tracking Brian Paul (49): Major check-in of changes for GL_EXT_framebuffer_object extension. fix xm_span2.c reference FBO changes fix s_spantemp.h includes more updates for users of s_spantemp.h add PROGRAM_DIRS line added a comment fix typo minor face-lift for web pages remove some test code fix for renderbuffer (Andreas Stenglein) restore call to SetBuffer() in clear_color_buffers(), only temporary remove bad assertion, added new ones in clear_pixmap() fix cpp / bytesPerPixel problem (bug 1196554) fix a bunch of html errors x86-64 transform optimizations (Mikko T.) assorted warning clean-ups for x86_64, etc (Mikko T.) Patches for XCB (Jeremy Kolb) added linux-x86-xcb config (Jeremy Kolb) x86_64 stuff remove some dead code fix GetRow parameters (Nicolai Haehnle) minor tweaks remove MESA suffix from _eglInitScreenSurface, use swAlpha value make _eglSetConfigAtrib() a static function, and rename it define M_E if needed restore _eglSetConfigAttrib (for now), added prototype _eglConfigToContextModesRec() added boolean extension flags to _EGLDriver s/Atrib/Attrib/, set extension enable flags separate ext strings with a space use EGLint instead of unsigned long for eglCopyContextMESA, added comments EGL_MESA_copy_context stuff another GLX / XCB patch (Jeremy Kolb) remove -ansi -pedantic -D_POSIX_C_SOURCE=199309L from CXXFLAGS added _eglInitPbufferSurface() more work on _eglConfigToContextModesRec() update comments updated demoCreatePbufferSurface() Added software-based pbuffer support (untested). remove glmode stuff fix pbuffer sample code remove eglQueryDisplayMESA() don't include strings.h fix some BCOMP/ACOMP typos (fixes Brad King's vtk failures) To better exercise pixel packing, replace regular glReadPixels with four remove the XFree86 ID line replace // with /* */ fix reversed strstr() args, print mode string use MAX_SCREENS instead of hard-coded number Daniel Borca (4): fix some typos in FX code accomodate new frambuffer changes pathetic attempt to accomodate new frambuffer changes (still some work to do) remove stupid flags Dave Airlie (4): use shared-core instead of shared use shared-core rather than shared make linux-solo and linux-solo-x86 config files hierarchical make egl build first so we don't get wierd drivers linking to libs not available Felix Kuehling (1): Don't use _mesa_swizzle_ubyte_image if all three texture formats Ian Romanick (8): Remove some unused structure fields, add some comments, and ifdef out some Rearranged some code and added some comments to mgaAllocDmaLow. The More comments. More dead-code removed. More clean-up. In addition to dead-code removal and other clean-up, bump the required DDX Add support for modes with a depth-buffer but no stencil-buffer. This Only use x86 / SSE assembly when USE_X86_ASM / USE_SSE_ASM are defined. Commit the changes propagated from Jeremy Kolb's changes to the Python Fix a couple typeos in enum names. Jerome Glisse (2): Adding r300 fragment program swizzle tab. Please some Small change to handle native case (7 natives case) Jon Smirl (23): Minor touchups to fbdev renderbuffer support Fix up origin in dri/fb driver Fix problem generating mode db. Miniglxtest works now. fbdri can draw double buffered now. Next step is to convert it dri fb works using renderbuffers now in RGBA mode First attempt at getting egl support up on dumb framebuffer. Forgot to add fb_egl.c Fix compile error in demo egl driver Add forgotten demo2.c Fix compiler warning about missing parameter list Add empty placeholder for eglCopyContextMESA A few egl patches needed for glitz, mainly config BITS Add error about write permission to fbdev attribs Implement query of surface type. Fix several internal problems with generating the list of configs. Make EGL_NO_MODE_MESA work. Compute stride in the right order Check error return from _eglInitPbufferSurface() correctly Implement fbdev swapbuffers() Fix for writing the wrong sysfs variable when blanking Fix inverted y for egl fbdev, add egl demo3 Fix EGL fbdev palette problem. demo3 can save ppm of screen Remove some debug output Jouk Jansen (2): Committing in . Committing in . Karl Schultz (18): Port Mesa to build on a P64 platform (e.g., Win64). P64 platforms The "P" suffix on APIENTRY and GLAPIENTRY is to be used for pointers to Removing in favor of new Windows build directory. Visual Studio 6 workspace for Mesa libraries. Visual Studio 6 project file for Windows GDI driver. Visual Studio 6 project file for GLU library. Needed to build .cc files in Visual Studio 6. Visual Studio 6 project file for core Mesa. Visual Studio 6 project file for OSmesa library. Change prototype for TextureMemCpy to return void* (was void). Major code cleanup and begin using new render buffer interface. moved to windows build dir moved to windows build dir Visual Studio 6 project file to build GLUT and some demos. project file to build gears fix location of gears project project file for glut library Cleanup some Windows junk. Keith Whitwell (63): Fallback (rather than fail) on unknown program targets. check for null DrawBuffer values Use driver functions to create TexEnvProgram, TnlProgram i915 will use _TexEnvProgram (if active) Try not to use the same temp reg as a TXP destination more than once, Fix texenv segfault. Reported by Ben Skeggs. Temporary fix - delete and recreate texenvprogram so that drivers get fog working with _TexEnvProgram Better driver notification on changes. Update for FragmentProgram._Active Missing from previous commit don't be fooled into emitting padding for wpos when not used reduce the use of malloc and strdup for parameter lists Double-buffer generated instructions and only notify driver when the Fix some valgrind complaints Double-buffer generated instructions and only notify driver when the Improved detection of program changes. fix some valgrind complaints Fix some valgrind complaints Ensure programs don't overflow allocated instruction store. Fix logic for allocating texture temporaries (Ben Skeggs). Rename temp_flag to temp_in_use. Use ctx->Const.MaxVertexProgramTemps Fix valgrind complaint, conform vertex order test. Fix glean/conform problems. Don't generate so much output when Test for texcoord[3] == zero before dividing. Not so sure about this Don't let FragmentProgram._Active influence choice of vertex vs pixel Use _mesa_memset rather than memset Previously in TXP and TEX instructions, lambda was passed to Don't let FragmentProgram._Active influence choice of vertex vs pixel When lighting is enabled, but no lights are enabled, the scenecolor Add check for mask == NULL to the one routine missing it. Turn disassem off (oops). Rein in debug slightly new MESA_DEBUG option: disassem Calculate render inputs for tcl stage correctly (hint: they aren't the Apply r200 tcl fix to radeon - compiles but untested. Deal better with indirection and indirection accounting, developed Disable leftover debug statements Checkpoint commit: Preliminary version of a facility to emit x86/sse code Generates working SSE code for gears under the swrast driver. Eliminate a couple of swizzles. Fix a few typos, initialize p->identity. Remove old t_vertex.c codegen infrastructure, tie in new code. Rename emit functions to reflect instruction set in use (ie move osmesa demos to their own directory Re-initialize viewport shadows each time. Cope with the common 3ub and 1ub cases. Invalidate current fastpath on changes to attribute size or offset within Re-enable X11 optimized triangle funcs. Remove debug printfs Restore the negate() function. Support ARB_texture_env_crossbar. Changes the way programs are Detect use of disabled textures as tex_env_crossbar sources. silence gcc warnings Import Thomas Helstrom's SSE memcpy code from the via X.org driver. Use SSE for vertex emit -- another good speedup. Disable recent sse change pending more testing. Initialize hw stencil renderbuffer. Fix various issues with cliprects and MakeCurrent Disable polygon stipple - it seems to break if certain specific stipple add special case for flat shaded + separate specular triangles Provide initial values for some variables. Bump driver date. Michal Krol (15): fix info log grabbing add static_assert macro intermediate code generator (not finished); change the behaviour of enter and local_addr instructions stand-alone vertsions of grammar_mesa - used by utilities; add mesa/shader/grammar to include list remove the GLSL spec wording; moved from mesa/shader to mesa/shader/grammar update grammar_mesa.c path ncrease stack size more slang code add shader/slang/slang_assemble_assignment.c silencium gcc warnings a small utility to convert .syn files to its binary forms; change local var names from "asm" to "assem" - I guess it caused Nicolai Haehnle (9): Patch from Jeff Smith: Patch from Jeff Smith: Remove quiescence sequence from r300ClearBuffer. Make software fallbacks work again: Don't print debug messages unless the user explicitly requested them Fix span functions for stencil buffer access. Remove dead span functions code. The kernel doesn't like command buffers over 64KB, so we don't Cleanup blend state generation. --- Makefile | 2 Makefile.DJ | 6 Makefile.mgw | 6 Mesa.dsw | 179 configs/default | 1 configs/linux-fbdev | 3 configs/linux-solo | 26 configs/linux-solo-x86 | 32 configs/linux-x86-32 | 2 configs/linux-x86-64 | 6 configs/linux-x86-64-debug | 28 configs/linux-x86-64-static | 2 configs/linux-x86-xcb | 24 docs/RELNOTES-6.3 | 5 docs/VERSIONS | 4 docs/banner.html | 36 docs/contents.html | 10 docs/gears.png |binary docs/index.html | 33 docs/mesa.css | 5 docs/news.html | 4 docs/thanks.html | 16 include/GL/gl.h | 4 include/GL/glfbdev.h | 5 include/GLES/egl.h | 11 progs/demos/Makefile | 17 progs/demos/descrip.mms | 8 progs/demos/osdemo.c | 322 - progs/demos/osdemo16.c | 291 - progs/demos/osdemo32.c | 308 - progs/demos/readpix.c | 60 progs/demos/reflect.c | 2 progs/egl/Makefile | 16 progs/egl/demo1.c | 69 progs/egl/demo2.c | 190 progs/egl/demo3.c | 635 +++ progs/egl/eglinfo.c | 18 progs/osdemos/Makefile | 73 progs/osdemos/osdemo.c | 322 + progs/osdemos/osdemo16.c | 291 + progs/osdemos/osdemo32.c | 308 + progs/samples/Makefile | 1 progs/samples/Makefile.DJ | 5 progs/samples/Makefile.mgw | 5 progs/samples/blendxor.c | 2 progs/samples/loadppm.c | 2 progs/tests/Makefile | 2 progs/tests/api_speed.c | 4 progs/tests/fbotest1.c | 169 progs/tests/fbotexture.c | 276 + progs/tests/getprocaddress.c | 1 progs/xdemos/glxgears_fbconfig.c | 12 src/egl/drivers/demo/demo.c | 112 src/egl/main/eglapi.c | 65 src/egl/main/eglconfig.c | 297 + src/egl/main/eglconfig.h | 17 src/egl/main/eglcontext.c | 16 src/egl/main/eglcontext.h | 3 src/egl/main/egldisplay.c | 6 src/egl/main/egldisplay.h | 7 src/egl/main/egldriver.c | 26 src/egl/main/egldriver.h | 17 src/egl/main/eglmode.c | 27 src/egl/main/eglmode.h | 7 src/egl/main/eglscreen.c | 75 src/egl/main/eglscreen.h | 16 src/egl/main/eglsurface.c | 77 src/egl/main/eglsurface.h | 4 src/glu/sgi/ccDebug.txt | 82 src/glu/sgi/ccDebugObj.txt | 73 src/glu/sgi/ccRelease.txt | 82 src/glu/sgi/ccReleaseObj.txt | 73 src/glu/sgi/glu.dsp | 888 ---- src/glu/sgi/libutil/mipmap.c | 98 src/glut/glx/Makefile | 2 src/glut/glx/glut.dsp | 338 - src/glut/glx/glut_cursor.c | 6 src/glw/Makefile | 2 src/glx/x11/glxext.c | 23 src/glx/x11/indirect.c | 486 ++ src/mesa/Makefile | 2 src/mesa/array_cache/array_cache.dsp | 108 src/mesa/drivers/common/driverfuncs.c | 12 src/mesa/drivers/dos/dmesa.c | 20 src/mesa/drivers/dri/Makefile.template | 13 src/mesa/drivers/dri/common/depthtmp.h | 69 src/mesa/drivers/dri/common/dri_util.c | 1 src/mesa/drivers/dri/common/drirenderbuffer.c | 96 src/mesa/drivers/dri/common/drirenderbuffer.h | 39 src/mesa/drivers/dri/common/spantmp.h | 54 src/mesa/drivers/dri/common/spantmp2.h | 105 src/mesa/drivers/dri/common/stenciltmp.h | 69 src/mesa/drivers/dri/dri_client/Makefile | 2 src/mesa/drivers/dri/fb/Makefile | 13 src/mesa/drivers/dri/fb/fb_dri.c | 443 -- src/mesa/drivers/dri/fb/fb_egl.c | 883 ++++ src/mesa/drivers/dri/ffb/Makefile | 10 src/mesa/drivers/dri/ffb/ffb_clear.c | 20 src/mesa/drivers/dri/ffb/ffb_state.c | 4 src/mesa/drivers/dri/ffb/ffb_xmesa.c | 4 src/mesa/drivers/dri/gamma/Makefile | 9 src/mesa/drivers/dri/gamma/gamma_span.c | 4 src/mesa/drivers/dri/gamma/gamma_state.c | 8 src/mesa/drivers/dri/i810/Makefile | 10 src/mesa/drivers/dri/i810/i810context.c | 25 src/mesa/drivers/dri/i810/i810ioctl.c | 12 src/mesa/drivers/dri/i810/i810screen.c | 45 src/mesa/drivers/dri/i810/i810span.c | 53 src/mesa/drivers/dri/i810/i810span.h | 5 src/mesa/drivers/dri/i810/i810state.c | 6 src/mesa/drivers/dri/i830/Makefile | 11 src/mesa/drivers/dri/i830/i830_context.c | 17 src/mesa/drivers/dri/i830/i830_ioctl.c | 28 src/mesa/drivers/dri/i830/i830_screen.c | 74 src/mesa/drivers/dri/i830/i830_span.c | 91 src/mesa/drivers/dri/i830/i830_span.h | 5 src/mesa/drivers/dri/i830/i830_state.c | 8 src/mesa/drivers/dri/i915/Makefile | 11 src/mesa/drivers/dri/i915/i830_metaops.c | 6 src/mesa/drivers/dri/i915/i915_context.c | 6 src/mesa/drivers/dri/i915/i915_context.h | 1 src/mesa/drivers/dri/i915/i915_fragprog.c | 34 src/mesa/drivers/dri/i915/i915_metaops.c | 6 src/mesa/drivers/dri/i915/i915_program.c | 2 src/mesa/drivers/dri/i915/i915_state.c | 12 src/mesa/drivers/dri/i915/i915_vtbl.c | 3 src/mesa/drivers/dri/i915/intel_batchbuffer.c | 20 src/mesa/drivers/dri/i915/intel_context.c | 36 src/mesa/drivers/dri/i915/intel_ioctl.c | 30 src/mesa/drivers/dri/i915/intel_pixel.c | 1 src/mesa/drivers/dri/i915/intel_screen.c | 72 src/mesa/drivers/dri/i915/intel_span.c | 78 src/mesa/drivers/dri/i915/intel_span.h | 5 src/mesa/drivers/dri/i915/intel_state.c | 9 src/mesa/drivers/dri/i915/intel_tris.c | 6 src/mesa/drivers/dri/mach64/Makefile | 10 src/mesa/drivers/dri/mach64/mach64_context.c | 8 src/mesa/drivers/dri/mach64/mach64_dd.c | 3 src/mesa/drivers/dri/mach64/mach64_ioctl.c | 12 src/mesa/drivers/dri/mach64/mach64_lock.c | 2 src/mesa/drivers/dri/mach64/mach64_screen.c | 50 src/mesa/drivers/dri/mach64/mach64_span.c | 71 src/mesa/drivers/dri/mach64/mach64_span.h | 5 src/mesa/drivers/dri/mach64/mach64_state.c | 10 src/mesa/drivers/dri/mga/Makefile | 10 src/mesa/drivers/dri/mga/mga_xmesa.c | 177 src/mesa/drivers/dri/mga/mga_xmesa.h | 46 src/mesa/drivers/dri/mga/mgadd.c | 3 src/mesa/drivers/dri/mga/mgaioctl.c | 187 src/mesa/drivers/dri/mga/mgaioctl.h | 33 src/mesa/drivers/dri/mga/mgapixel.c | 20 src/mesa/drivers/dri/mga/mgaspan.c | 59 src/mesa/drivers/dri/mga/mgaspan.h | 6 src/mesa/drivers/dri/mga/mgastate.c | 6 src/mesa/drivers/dri/mga/server/mga_dri.h | 58 src/mesa/drivers/dri/r128/Makefile | 10 src/mesa/drivers/dri/r128/r128_context.c | 8 src/mesa/drivers/dri/r128/r128_dd.c | 3 src/mesa/drivers/dri/r128/r128_ioctl.c | 16 src/mesa/drivers/dri/r128/r128_lock.c | 2 src/mesa/drivers/dri/r128/r128_screen.c | 49 src/mesa/drivers/dri/r128/r128_span.c | 53 src/mesa/drivers/dri/r128/r128_span.h | 5 src/mesa/drivers/dri/r128/r128_state.c | 8 src/mesa/drivers/dri/r200/Makefile | 11 src/mesa/drivers/dri/r200/r200_context.c | 15 src/mesa/drivers/dri/r200/r200_ioctl.c | 16 src/mesa/drivers/dri/r200/r200_lock.c | 4 src/mesa/drivers/dri/r200/r200_screen.c | 61 src/mesa/drivers/dri/r200/r200_span.c | 66 src/mesa/drivers/dri/r200/r200_span.h | 5 src/mesa/drivers/dri/r200/r200_state.c | 6 src/mesa/drivers/dri/r200/r200_tcl.c | 33 src/mesa/drivers/dri/r300/Makefile | 1 src/mesa/drivers/dri/r300/r300_cmdbuf.c | 25 src/mesa/drivers/dri/r300/r300_context.c | 91 src/mesa/drivers/dri/r300/r300_context.h | 84 src/mesa/drivers/dri/r300/r300_emit.h | 1 src/mesa/drivers/dri/r300/r300_fragprog.c | 1034 +++++ src/mesa/drivers/dri/r300/r300_fragprog.h | 50 src/mesa/drivers/dri/r300/r300_fragprog_swz.c | 1343 ++++++ src/mesa/drivers/dri/r300/r300_ioctl.c | 74 src/mesa/drivers/dri/r300/r300_maos.c | 35 src/mesa/drivers/dri/r300/r300_reg.h | 73 src/mesa/drivers/dri/r300/r300_render.c | 110 src/mesa/drivers/dri/r300/r300_shader.c | 36 src/mesa/drivers/dri/r300/r300_state.c | 911 +--- src/mesa/drivers/dri/r300/r300_texprog.c | 9 src/mesa/drivers/dri/r300/r300_texstate.c | 8 src/mesa/drivers/dri/r300/r300_vertexprog.c | 49 src/mesa/drivers/dri/r300/radeon_context.c | 7 src/mesa/drivers/dri/r300/radeon_lock.c | 12 src/mesa/drivers/dri/r300/radeon_screen.c | 56 src/mesa/drivers/dri/r300/radeon_span.c | 272 - src/mesa/drivers/dri/r300/radeon_span.h | 3 src/mesa/drivers/dri/radeon/Makefile | 10 src/mesa/drivers/dri/radeon/radeon_context.c | 13 src/mesa/drivers/dri/radeon/radeon_ioctl.c | 16 src/mesa/drivers/dri/radeon/radeon_lock.c | 4 src/mesa/drivers/dri/radeon/radeon_screen.c | 63 src/mesa/drivers/dri/radeon/radeon_screen.h | 3 src/mesa/drivers/dri/radeon/radeon_span.c | 65 src/mesa/drivers/dri/radeon/radeon_span.h | 4 src/mesa/drivers/dri/radeon/radeon_state.c | 6 src/mesa/drivers/dri/radeon/radeon_tcl.c | 26 src/mesa/drivers/dri/s3v/Makefile | 10 src/mesa/drivers/dri/s3v/s3v_context.h | 2 src/mesa/drivers/dri/s3v/s3v_dd.c | 3 src/mesa/drivers/dri/s3v/s3v_screen.h | 3 src/mesa/drivers/dri/s3v/s3v_span.c | 61 src/mesa/drivers/dri/s3v/s3v_state.c | 6 src/mesa/drivers/dri/s3v/s3v_xmesa.c | 99 src/mesa/drivers/dri/savage/Makefile | 10 src/mesa/drivers/dri/savage/savage_init.h | 10 src/mesa/drivers/dri/savage/savage_xmesa.c | 81 src/mesa/drivers/dri/savage/savagedd.c | 3 src/mesa/drivers/dri/savage/savageioctl.c | 16 src/mesa/drivers/dri/savage/savagespan.c | 74 src/mesa/drivers/dri/savage/savagespan.h | 9 src/mesa/drivers/dri/savage/savagestate.c | 6 src/mesa/drivers/dri/sis/Makefile | 10 src/mesa/drivers/dri/sis/sis_clear.c | 38 src/mesa/drivers/dri/sis/sis_context.c | 8 src/mesa/drivers/dri/sis/sis_dd.c | 11 src/mesa/drivers/dri/sis/sis_screen.c | 68 src/mesa/drivers/dri/sis/sis_span.c | 74 src/mesa/drivers/dri/sis/sis_span.h | 6 src/mesa/drivers/dri/sis/sis_state.c | 6 src/mesa/drivers/dri/sis/sis_tris.c | 2 src/mesa/drivers/dri/tdfx/Makefile | 10 src/mesa/drivers/dri/tdfx/tdfx_context.c | 14 src/mesa/drivers/dri/tdfx/tdfx_dd.c | 3 src/mesa/drivers/dri/tdfx/tdfx_pixels.c | 4 src/mesa/drivers/dri/tdfx/tdfx_render.c | 40 src/mesa/drivers/dri/tdfx/tdfx_screen.c | 58 src/mesa/drivers/dri/tdfx/tdfx_span.c | 146 src/mesa/drivers/dri/tdfx/tdfx_span.h | 4 src/mesa/drivers/dri/tdfx/tdfx_state.c | 10 src/mesa/drivers/dri/trident/Makefile | 10 src/mesa/drivers/dri/trident/trident_context.c | 74 src/mesa/drivers/dri/trident/trident_context.h | 10 src/mesa/drivers/dri/trident/trident_dd.c | 3 src/mesa/drivers/dri/trident/trident_state.c | 15 src/mesa/drivers/dri/unichrome/Makefile | 11 src/mesa/drivers/dri/unichrome/via_context.c | 38 src/mesa/drivers/dri/unichrome/via_context.h | 5 src/mesa/drivers/dri/unichrome/via_ioctl.c | 20 src/mesa/drivers/dri/unichrome/via_memcpy.c | 138 src/mesa/drivers/dri/unichrome/via_screen.c | 68 src/mesa/drivers/dri/unichrome/via_screen.h | 1 src/mesa/drivers/dri/unichrome/via_span.c | 64 src/mesa/drivers/dri/unichrome/via_span.h | 5 src/mesa/drivers/dri/unichrome/via_state.c | 108 src/mesa/drivers/dri/unichrome/via_tex.c | 11 src/mesa/drivers/dri/unichrome/via_tex.h | 4 src/mesa/drivers/dri/unichrome/via_tris.c | 79 src/mesa/drivers/dri/x11/Makefile | 2 src/mesa/drivers/fbdev/glfbdev.c | 413 +- src/mesa/drivers/glide/fxapi.c | 13 src/mesa/drivers/glide/fxdd.c | 46 src/mesa/drivers/glide/fxddspan.c | 20 src/mesa/drivers/osmesa/osmesa.c | 475 +- src/mesa/drivers/osmesa/osmesa.dsp | 119 src/mesa/drivers/svga/svgamesa8.c | 22 src/mesa/drivers/windows/gdi/colors.h | 536 -- src/mesa/drivers/windows/gdi/gdi.dsp | 137 src/mesa/drivers/windows/gdi/mesa.def | 21 src/mesa/drivers/windows/gdi/wgl.c | 1001 ++--- src/mesa/drivers/windows/gdi/wmesa.c | 4101 ++++----------------- src/mesa/drivers/windows/gdi/wmesadef.h | 179 src/mesa/drivers/x11/descrip.mms | 5 src/mesa/drivers/x11/fakeglx.c | 39 src/mesa/drivers/x11/glxheader.h | 1 src/mesa/drivers/x11/xm_api.c | 375 - src/mesa/drivers/x11/xm_buffer.c | 111 src/mesa/drivers/x11/xm_dd.c | 749 +-- src/mesa/drivers/x11/xm_line.c | 129 src/mesa/drivers/x11/xm_span.c | 2331 ++++++----- src/mesa/drivers/x11/xm_tri.c | 334 - src/mesa/drivers/x11/xmesaP.h | 117 src/mesa/glapi/EXT_framebuffer_object.xml | 4 src/mesa/glapi/glX_proto_send.py | 65 src/mesa/glapi/glapi.dsp | 124 src/mesa/main/accum.c | 19 src/mesa/main/api_arrayelt.c | 4 src/mesa/main/attrib.c | 7 src/mesa/main/blend.c | 2 src/mesa/main/bufferobj.c | 6 src/mesa/main/buffers.c | 548 +- src/mesa/main/buffers.h | 7 src/mesa/main/config.h | 13 src/mesa/main/context.c | 243 - src/mesa/main/context.h | 36 src/mesa/main/dd.h | 28 src/mesa/main/debug.c | 3 src/mesa/main/depth.c | 5 src/mesa/main/descrip.mms | 15 src/mesa/main/dlist.c | 13 src/mesa/main/enable.c | 21 src/mesa/main/extensions.c | 8 src/mesa/main/fbobject.c | 379 - src/mesa/main/fbobject.h | 141 src/mesa/main/framebuffer.c | 513 ++ src/mesa/main/framebuffer.h | 67 src/mesa/main/get.c | 114 src/mesa/main/get_gen.py | 54 src/mesa/main/glheader.h | 31 src/mesa/main/imports.c | 18 src/mesa/main/imports.h | 7 src/mesa/main/main.dsp | 540 -- src/mesa/main/matrix.c | 16 src/mesa/main/mtypes.h | 304 + src/mesa/main/pixel.c | 2 src/mesa/main/polygon.c | 3 src/mesa/main/rastpos.c | 2 src/mesa/main/renderbuffer.c | 1863 +++++++++ src/mesa/main/renderbuffer.h | 84 src/mesa/main/state.c | 13 src/mesa/main/texcompress_fxt1.c | 8 src/mesa/main/texenvprogram.c | 390 + src/mesa/main/texformat.c | 67 src/mesa/main/texformat_tmp.h | 730 +++ src/mesa/main/texrender.c | 197 + src/mesa/main/texrender.h | 12 src/mesa/main/texstore.c | 88 src/mesa/math/m_debug_util.h | 38 src/mesa/math/m_debug_xform.c | 10 src/mesa/math/m_translate.c | 2 src/mesa/math/m_xform.c | 6 src/mesa/math/math.dsp | 180 src/mesa/shader/arbprogparse.c | 2 src/mesa/shader/arbprogram.c | 2 src/mesa/shader/grammar.c | 3148 ---------------- src/mesa/shader/grammar.h | 103 src/mesa/shader/grammar.syn | 567 -- src/mesa/shader/grammar/grammar.c | 3148 ++++++++++++++++ src/mesa/shader/grammar/grammar.h | 103 src/mesa/shader/grammar/grammar.syn | 567 ++ src/mesa/shader/grammar/grammar_crt.c | 64 src/mesa/shader/grammar/grammar_crt.h | 20 src/mesa/shader/grammar/grammar_mesa.c | 87 src/mesa/shader/grammar/grammar_mesa.h | 43 src/mesa/shader/grammar/grammar_syn.h | 202 + src/mesa/shader/grammar_mesa.c | 87 src/mesa/shader/grammar_mesa.h | 43 src/mesa/shader/grammar_syn.h | 202 - src/mesa/shader/nvfragparse.c | 2 src/mesa/shader/nvprogram.c | 2 src/mesa/shader/nvvertparse.c | 2 src/mesa/shader/program.c | 59 src/mesa/shader/program.h | 1 src/mesa/shader/shader.dsp | 493 -- src/mesa/shader/shaderobjects_3dlabs.c | 6 src/mesa/shader/slang/descrip.mms | 13 src/mesa/shader/slang/library/gc_to_bin.c | 79 src/mesa/shader/slang/library/slang_core.gc | 3304 ++++++++-------- src/mesa/shader/slang/library/slang_core_gc.h | 606 +-- src/mesa/shader/slang/library/slang_core_gc_bin.h | 1377 ++----- src/mesa/shader/slang/slang_assemble.c | 1208 ++++++ src/mesa/shader/slang/slang_assemble.h | 145 src/mesa/shader/slang/slang_assemble_assignment.c | 187 src/mesa/shader/slang/slang_assemble_assignment.h | 45 src/mesa/shader/slang/slang_assemble_conditional.c | 485 ++ src/mesa/shader/slang/slang_assemble_conditional.h | 67 src/mesa/shader/slang/slang_assemble_constructor.c | 339 + src/mesa/shader/slang/slang_assemble_constructor.h | 80 src/mesa/shader/slang/slang_assemble_typeinfo.c | 430 ++ src/mesa/shader/slang/slang_assemble_typeinfo.h | 67 src/mesa/shader/slang/slang_compile.c | 356 + src/mesa/shader/slang/slang_compile.h | 35 src/mesa/shader/slang/slang_execute.c | 349 + src/mesa/shader/slang/slang_execute.h | 57 src/mesa/shader/slang/slang_storage.c | 255 + src/mesa/shader/slang/slang_storage.h | 109 src/mesa/shader/slang/slang_utility.h | 2 src/mesa/sources | 28 src/mesa/swrast/descrip.mms | 12 src/mesa/swrast/s_accum.c | 802 ++-- src/mesa/swrast/s_accum.h | 11 src/mesa/swrast/s_alphabuf.c | 332 - src/mesa/swrast/s_alphabuf.h | 80 src/mesa/swrast/s_auxbuffer.c | 129 src/mesa/swrast/s_auxbuffer.h | 41 src/mesa/swrast/s_blend.c | 26 src/mesa/swrast/s_blend.h | 12 src/mesa/swrast/s_buffers.c | 381 + src/mesa/swrast/s_context.c | 37 src/mesa/swrast/s_context.h | 3 src/mesa/swrast/s_copypix.c | 82 src/mesa/swrast/s_depth.c | 912 +--- src/mesa/swrast/s_depth.h | 22 src/mesa/swrast/s_drawpix.c | 128 src/mesa/swrast/s_feedback.c | 13 src/mesa/swrast/s_imaging.c | 34 src/mesa/swrast/s_linetemp.h | 3 src/mesa/swrast/s_logic.c | 588 --- src/mesa/swrast/s_logic.h | 13 src/mesa/swrast/s_masking.c | 80 src/mesa/swrast/s_masking.h | 23 src/mesa/swrast/s_nvfragprog.c | 58 src/mesa/swrast/s_readpix.c | 91 src/mesa/swrast/s_span.c | 461 +- src/mesa/swrast/s_span.h | 6 src/mesa/swrast/s_spantemp.h | 344 - src/mesa/swrast/s_stencil.c | 417 -- src/mesa/swrast/s_stencil.h | 16 src/mesa/swrast/s_texstore.c | 8 src/mesa/swrast/s_triangle.c | 28 src/mesa/swrast/s_tritemp.h | 9 src/mesa/swrast/swrast.dsp | 336 - src/mesa/swrast/swrast.h | 87 src/mesa/swrast_setup/ss_tritmp.h | 28 src/mesa/swrast_setup/swrast_setup.dsp | 124 src/mesa/tnl/descrip.mms | 8 src/mesa/tnl/t_context.c | 4 src/mesa/tnl/t_context.h | 62 src/mesa/tnl/t_pipeline.c | 16 src/mesa/tnl/t_save_api.c | 6 src/mesa/tnl/t_vb_arbprogram.c | 4 src/mesa/tnl/t_vertex.c | 1345 +----- src/mesa/tnl/t_vertex.h | 62 src/mesa/tnl/t_vertex_c.c | 267 - src/mesa/tnl/t_vertex_codegen.c | 510 -- src/mesa/tnl/t_vertex_generic.c | 1119 +++++ src/mesa/tnl/t_vertex_sse.c | 1267 ++++++ src/mesa/tnl/t_vp_build.c | 195 src/mesa/tnl/tnl.dsp | 228 - src/mesa/tnl_dd/t_dd_tritmp.h | 17 src/mesa/x86-64/Makefile | 29 src/mesa/x86-64/calling_convention.txt | 50 src/mesa/x86-64/matypes.h | 164 src/mesa/x86-64/x86-64.c | 115 src/mesa/x86-64/x86-64.h | 32 src/mesa/x86-64/xform4.S | 458 ++ src/mesa/x86/assyntax.h | 12 src/mesa/x86/gen_matypes.c | 4 src/mesa/x86/glapi_x86.S | 10 windows/VC6/mesa/gdi/gdi.dsp | 141 windows/VC6/mesa/glu/compileDebug.txt | 82 windows/VC6/mesa/glu/compileRelease.txt | 82 windows/VC6/mesa/glu/glu.dsp | 985 +++++ windows/VC6/mesa/glu/objectsDebug.txt | 73 windows/VC6/mesa/glu/objectsRelease.txt | 73 windows/VC6/mesa/mesa.dsw | 74 windows/VC6/mesa/mesa/mesa.dsp | 1318 ++++++ windows/VC6/mesa/osmesa/osmesa.dsp | 125 windows/VC6/progs/demos/gears.dsp | 114 windows/VC6/progs/glut/glut.dsp | 333 + windows/VC6/progs/progs.dsw | 41 449 files changed, 40460 insertions(+), 28354 deletions(-) ---