[Xquartz-changes] mesa: Changes to 'refs/tags/jump_and_click'

Jeremy Huddleston jeremyhu at freedesktop.org
Thu Jan 1 01:04:46 PST 2015


Tag 'jump_and_click' created by Vladimir Dergachev <volodya at freedesktop.org> at 1970-01-01 00:00 -0800

Changes since blended_fountain:
Aapo Tahkola (15):
      Add radeon 9550 pci id.
      Mipmapping and other texture filters now work.
      Added fixes for filter modes and support for anisotropy filters.
      Looks like masking masking t->filter isnt needed anymore.
      I was wrong...
      This fixes it but why mipmaps still work?
      border_color causes lockups with vertex buffers. Disabling for now.
      Fixes for clamp modes.
      Add vector distance operator for vertex programs.
      Add basic sceleton for vertex programs + some other fixes
      Forgot one comment...
      Fix wrong comment.
      Cleaning up.
      Beginings of program generation. This code havent been tested nor hooked up.
      Fix for compiler warnings.

Adam Jackson (5):
      Parallel build fix.  Multiword variables on the target side of a : get
      Enable libGL to be built with DRI_NEW_INTERFACE_ONLY (but don't do it yet).
      silence makedepend warnings about non-portable whitespace
      HAVE_ALIAS was never defined anywhere, add some logic to turn it on
      Bug #2428: #ifdef GLX_DIRECT_RENDERING in DRI drivers is pointless.

Alan Hourihane (29):
      Bring VIA driver up-to-date with regard to drm_*_t changes and remove
      fix build problem
      Only try to free the front buffer when it's a pbuffer.
      support 720x480 and 960x540 modes
      Add Intel i915GM support, and these extensions.
      Fallback on PolygonStipple for CLE266 hardware.
      Fix usage of texture units, when TEX1 is enabled, but not TEX0.
      fallback on polygon.stippleflag (thanks Keith)
      Fix ColorMask
      uncomment
      Fix the calculation of the alpha reference value which negates the
      fix a typo
      Fix multitexturing.
      build fixes and enable agp dma
      Fixes lockups initializing AGP DMA.
      Check for deletion of currently bound context
      Use the faster span read/write template for 16bpp
      As we fallback for polygon stipple on the CLE266 for now, ensure we
      Fix glean scissor test
      revert some makecurrent code
      remove some dead texture code
      16bpp doesn't support masked clears, so fallback when they're enabled.
      Get PolygonStipple working.. (or seemingly too). It seems to do the right
      silence a warning
      Enable line stippling.
      Fix tristrips (which fixes coloredTexPerf2 & coloredLitPerf2 glean tests)
      remove some debug
      Enclose passed macro values in brackets to ensure correct read/write span
      silence the 'using AGP/PCI' string unless VIA_DEBUG is used.

Ben Skeggs (1):
      Added GL_POLYGON primitive. Single primitive between glBegin()/glEnd() now works.

Brian Paul (63):
      In choose_visual() we need to know if we're being called from
      New GetAllFBConfigs() function.  Some FBConfigs weren't reported before.
      added GetAllFBConfigs()
      fix-up rules for sphere demo, which uses readtex utility
      compute reasonable animate rate (Marcelo Magallon)
      rotate at a reasonable rate
      animation rate patch (Marcello Magallon)
      Add #ifdefs for extension testing (Marcello Magallon)
      include readtex.h instead of readtex.c (Marcello Magallon)
      include readtex.h instead of readtex.c
      some new/improved rules
      better animate rate (Marcelo Magallon)
      include readtex.h
      use #ifdef to test for extension
      rotate at fixed rate (Marcelo Magallon)
      rotate at fixed rate, changed fire effect (Marcelo Magallon)
      improved animation rate
      minor readtex fixes
      Windows/ReactOS patch (Gregor Anich)
      tweak output formattting, fixed uninitialized var error
      remove a debug line
      VMS updates from Jouk Jansen
      prototype _mesa_init_ati_fragment_shader()
      Some initial work for OpenGL 2.0: glStencilFunc/Op/MaskSeparate() functions.
      OpenGL 2.0 StencilFunc/Op/MaskSeparate functions
      temporary prototypes for OpenGL 2.0
      make tnl_clipspace_attr->insert field const, to silence warning
      _mesa_GetInteger/Float/Boolean/Doublev() are now generated with the new
      added a few OpenGL 2.0 tokens (temporary)
      added getstring.c
      fix a few warnings
      silence a bunch of warnings
      clean up gl2 structs
      silence warning
      fix some weirdness accidentally checked in in the past
      use FABSF(fogCoord) to fix fog calculation problem (Soju Matsumoto)
      added rule for compiling C++ sources
      minor reorg of shader files, disable building for now
      minor formatting fix
      fix a typo
      make sure the new instruction Data pointer is set to NULL
      Change behaviour of glDeleteTextures as discussed on ARB list.
      test program for texture sharing, deleting, etc
      added texobjshare.c
      Removed gl_texture_object's DeletePending.  Changed a comment.
      Use a simple CSS style sheet.
      Update glDeletePrograms/Buffers() so that the ID is freed immediately, like
      document new glDeleteTextures/Buffers/Programs behaviour
      glext.h version 26
      fix glGetString funniness
      Added _mesa_HashNextEntry() function to allow walking over all entries
      reenable some assertions
      Use the _mesa_HashNextEntry() function to walk over all textures in the
      just fix a comment and update date
      added mutex to-do comment
      just comments/clean-up
      remove a bunch of temporary #defines, now that glext.h was updated
      added missing glFinish()
      fix initial viewport size bug
      assorted fixes
      added osmesa16 stuff
      remove stray span.y++
      fix max viewport query

Daniel Borca (26):
      fix dstRGB factor
      added "default" branch in `convertPalette'
      removed detritus
      semantic in parameter names
      protected against elfish directives
      solved classic "char*" vs "char[]" conflict.  we were mimicking a pointer variable at desired location and then we took its address.  using array is more intuitive, as they give us the starting address instantly.
      semantic in parameter names
      semantic in parameter names.  changed emitter function.
      semantic in parameter names
      applied Keith's patch for "safe" type-punning.
      some "safer" type-punning (gcc optimizes float moves with integer moves, anyway).
      doc update
      changed coding style
      changed coding style.  added a NULL pointer check.
      changed coding style.  added possibility to use default timer instead of PC/HW timer.
      changed coding style.  made `glutTimerFunc' less accurate, but far more reliable.
      remove trailing slash from TOP definition
      since we've already messed up this one, let we do it further and make it look like a fire...
      fix compilation error for fx/Mesa
      allow more internalFormat/format combinations (i hope i got it right)
      cleaned up warnings
      There is no point trying to detect SSE at all, when MESA_NO_SSE is defined.  I am committing this because the current WIN32 SSE detection code crashes UnrealTournament2003.
      glVertex* is the provoking "cmd" (that is, by the time of glVertex*, we must have all other attributes already set).
      make sure we avoid assertion failure wrt VB->ColorPtr[1]->stride
      RGB/LUMINANCE texelfetchers (float version) returned 255.0F for alpha channel, instead of 1.0F
      makefile update (readtex, showbuffer)

Dave Airlie (4):
      add -DUSE_EXTERNAL_DXTN_LIB=1 so compressed textures are enabled for solo
      add sync debugging to the radeon driver
      reapply Keiths workaround for zbs emit that got dropped during
      add number of passes count to ati_fragment_shader

Felix Kuehling (18):
      * Fixed handling of scissors
      Fixed: ptex drawing functions were overridden with standard drawing
      Added state debugging option (SAVAGE_DEBUG=state).
      Added missing break; to fix infinite recursion between choose_emit_func
      * Flush and wait in per-primitive fallback functions. Fixes flickering
      Fixes to cope with the lack of AGP textures. This is all that's needed
      Make sure DMA buffers are released in savageDestroyContext. Usually
      Use HW_READ_LOCK and HW_READ_UNLOCK in assembler-optimized span read
      Converted to use spantmp2.h.
      Added a fast path for emitting unclipped primitives directly to a
      Added support for ELTS to the _savage_render_stage. Requires at least
      * Added options for disabling the fast path (render stage) and vertex DMA
      Small cleanup:
      Fixed polygon offset with reversed viewport depth range.
      My last attempt to fix polygon offsets with the reversed viewport depth
      Fixed initialization of draw destination to front buffer on single
      Converted the Savage texture management to use Ian's common texmem code.
      * Fixed uploading of textures of certain sizes.

Ian Romanick (29):
      Revert some accidental cross-merge changes.  Remove i915GetString.  Migrate
      The generic_*_byte functions did not rount the command size to a
      Pixel oriented render functions are now generated by the
      Refactor the code that converts a transpose-matrix enum to a
      Track the GLX protocol names for GL types.
      Script to generate rough GLX protocol documentation (as might be seen in
      Use GNU AS label aliasing, if available.  This must be enabled by adding
      Put quotes around the CC and CXX variables passed to mklib.  This make
      Added a couple missing proxy types.
      Make sure that functions added to gl_API.xml that do not have any GLX
      Since only one of the places that used glXFunction::command_payload_length
      Remove glEnum::startElement, but refactor out some of the common code from
      Correct some of the dependencies and clean things up a bit.
      Move all the code for generating "size" related functions to its own
      Correctly set the name of the generating script.
      Add a "count" attribute to "enums" elements to set the default count
      Stupid text editor...convert wayward tabs to spaces.
      Add a glFunctionIterator class to iterate over the functions stored in a
      remove a bunch of temporary #defines, now that glext.h was updated
      The 'mode' setting of a function within an 'enum' element is now used.
      Add numerous 'get'-type functions to most of the enums supported by the
      Mark a couple more function parameters as counters.
      Add an option to emit extra debug code in the generated protocol functions.
      Slightly modify the meaning of the 'handcode' attribute in a 'glx' element.
      Fix some get / set errors with COLOR_TABLE_*.  SCALE and BIAS can be
      Properly annotate variable-length output parameters.  Make sure that the
      Refactor the code to emit multiple-inclusion protection to
      Add GlxProto::createEnumFunction and add a 'context' parameter to the
      Small refactor.  Move several utility functions from glX_XML.py to

Keith Whitwell (49):
      If there is only one normal, don't transform it multiple times.
      Add a couple of hardwired fastpaths to t_vertex.c.
      Avoid a segfault in multiarb.c
      make alloc-dma functions inline, rearrange some debug
      Give attributes with zero-stride a count of 1 to make it easier
      Improve some quad paths, gives gears a little boost.
      Make the format of the fastpaths cleaner at the expense of a little
      Redraw on keypress, as apparently intended.
      Make clean in the x86 directory.
      Add an install target
      Improve the semantics of the 'install' target to make sure the right
      Add a noop install target
      Add a clean target to remove generated files.
      Remove -C flags for install which aren't universally supported.
      Use the 'to' vector to determine the loop count.
      Cope with the possibility that incoming vectors may have
      Add some more hardcoded fastpaths.
      Templatize the fastpaths.
      And fix the obvious bugs in higher-numbered templates.
      Add t_vb_cull.c (Bernard Blackham)
      Fix segfault in pipes by dealing with stride == 0 case in generic_interp_extras
      More changes to cope with color stride == 0
      Add a big nasty fallback for AlphaTest -- seems to always be wrong
      Temporarily disable pageflipping assert.
      Disable bogus pbuffer code (though this could be revived with a little
      Allow two GL primitives to be combined to one HW primitive
      Don't emit HC_SubA_HSPXYOS on CLE266.
      Add flag to clear texture caches after texture upload.
      Expand out the N(x) macro so that tags can find functions like
      new test to exercise context and window create/delete
      Remove bogus write to freed memory (valgrind).
      free buffer in t_vertex_c.c on context delete
      Simplify usage of drmHash functions and fix bug in
      Don't special-case 16bpp for colormask register - not needed.
      cut out dead texture state code
      Emit constant colors for texunit 1 blending.
      Typo
      Remove misleading comment.
      Simplify viaChooseVertexState slightly.
      Rename via_fastrender_* to avoid confusion with similar functions in
      Fix loop for quads-as-triangles.
      Populate WriteMonoDepthSpan in 24/8 modes.
      Fix previously un-noticed issue with flat-shaded points.
      Fix calculation of last_count in _tnl_wrap_buffers()
      Depend tweaks
      Remove depend on make clean
      Always use ARGB8888 hardware texture format when mesa specifies
      Bring the texcombine fixes to the trunk.
      Determine ahead of time whether a display list will include vertices

Michal Krol (29):
      aliasing was broken
      add shader/shaderobjects_3dlabs.c
      init ARB_shader_objects subsystem
      enable ARB_fragment/vertex_shader
      add ARB_shader_objects interfaces, shared and context state
      add shaderobjects_3dlabs.c
      add atifragshader.c, shaderobjects.c, shaderobjects_3dlabs.c, atifragshader.h,
      implement ARB_shader_objects, not complete
      cosmetic changes
      3dlabs glslang frontend, not complete
      3dlabs glslang frontend
      add s_atifragshader.c, s_atifragshader.h
      add src/mesa/shader/slang to INCLUDE_DIRS
      add [.slang] to INCDIR, fix comma in OBJECTS
      add 3dlabs_shhandle interface
      slang to mesa compatibility, tested only under Windows
      2005-oct-19 3dlabs slang compiler, tweaked a little bit
      add slang/ directory tree
      fix MAX_VERTEX_ATTRIBS_ARB query
      fix // comments
      add slang preprocessor C sources; add slang include directories
      change .cc suffix to .cpp
      add shader/slang/slang_mesa.cpp
      comment out _THROW calls, dont want to compile under Linux
      remove #ifndef linux, it isnt defined on Linux, where should I define it?
      Handy TIntermTraverser class wrapper
      add slang/traverse_wrap.h
      add getstring.c; remove arb*.h nv*.h stuff
      move file

Nicolai Haehnle (3):
      Synchronize r300_reg.h.
      Fix more warnings and compilation issues.
      Remove unused variables from r300_context

Roland Scheidegger (3):
      replace magic number with macro constant RADEON_ZBLOCK16
      new version check to allow to test for a range of ddx major versions, instead of just one major version
      (Stephane Marchesin, me) Add support for color (framebuffer) tiling to the radeon and r200 driver

Thomas Hellström (1):
      Small Unichrome fixes:

Vladimir Dergachev (35):
      Switch to a more complicated scheme of choosing texture formats, as it looks
      Add texture format to get lesson19 working again.
      Turns out the kfountain.kss (as well as lesson19) had a bug - the size was set wrong. Fixed.
      Implement a more elaborate hashing scheme for texture formats. Still not perfect.
      Port EmitPixelShader from cmdbuf.c to SetupPixelShader in state.c.
      Clean up the code and make it unnecessary to issue extra calls to Setup*Shaders
      For some reason we need r300Flush when using textures. Perhaps the problem is
      Bring vertex buffer code up to date..
      Copy sample pixel and vertex shaders to r300_fixed_pipelines.h
      Switch r300_state.c to use r300_fixed_pipelines.h instead of r300_lib.h.
      Move the few definitions from r300_lib.h still in use to r300_emit.h.
      Switch back to using immediate mode code - use of AGP space is interfering with texture management.
      Get NeHe lesson08 to work. Note: it appears the filtering does not work properly. Need to find place where it is broken and put an fprintf() complaining about it.
      Incorporate TX_FORMAT information contributed by Wladimir van der Laan.
      Prevent "disabling 3D acceleration" message from printing - we do not define raster functions anyway.
      Sync with master copy.
      Incorporate latest data from Wladimir van der Laan.
      Reduce amount of stderr output.
      Remove redundant register.
      Use symbolic constants to describe pixel shader ALU instructions.
      On the way to getting stencil and texture formats working.
      On the way to getting stencil working.
      Properly input stencil info contributed by Wladimir.
      Properly configure routing - based on advice by Keith Whitwell.
      Remove lots of old code that dealed with "magic" texture formats.
      struct ati_fragment_shader was not defined anywhere, define it to get r300_vertexprog.c to compile.
      My bad, the old code works fine if updated to newer Mesa tree.
      Use SecondaryColorPtr, not ColorPtr[1] (the latter is NULL).
      Add magic sequence to prevent ClearBuffer from locking up.
      It helps to print actual values instead of random ones.
      Looks like we can define FIRE_VERTICES correctly.
      Properly set ABLEND and CBLEND registers. The older code worked, but by accident.
      Get alpha in textures to work properly.
      Reduce noiseness of the driver.
      Make WARN_ONCE messages more informative.

hmarson (1):
      Added 0x4e54 (Thinkpad r50p) as PCI_CHIP_RV350_NP

---
 configs/linux-solo                                                 |    2 
 configs/linux-solo-x86                                             |    2 
 descrip.mms                                                        |    4 
 docs/README.DJ                                                     |    1 
 docs/RELNOTES-6.3                                                  |   30 
 docs/VERSIONS                                                      |    3 
 docs/bugs.html                                                     |    4 
 docs/conform.html                                                  |    4 
 docs/contents.html                                                 |   22 
 docs/custom.html                                                   |    4 
 docs/cvs_access.html                                               |    4 
 docs/cvs_branches.html                                             |    4 
 docs/debugging.html                                                |    4 
 docs/demos.html                                                    |    4 
 docs/devinfo.html                                                  |    4 
 docs/download.html                                                 |    4 
 docs/envvars.html                                                  |    4 
 docs/extensions.html                                               |    4 
 docs/faq.html                                                      |    4 
 docs/fbdev-dri.html                                                |    4 
 docs/games.html                                                    |    4 
 docs/glfbdev-driver.html                                           |    4 
 docs/glu.html                                                      |    4 
 docs/helpwanted.html                                               |    4 
 docs/index.html                                                    |    5 
 docs/install.html                                                  |    4 
 docs/intro.html                                                    |    4 
 docs/libraries.html                                                |    4 
 docs/license.html                                                  |    4 
 docs/lists.html                                                    |    4 
 docs/mangling.html                                                 |    4 
 docs/mesa.css                                                      |   35 
 docs/modelers.html                                                 |    4 
 docs/news.html                                                     |    6 
 docs/osmesa.html                                                   |    4 
 docs/pbuffers.html                                                 |    4 
 docs/perf.html                                                     |    4 
 docs/precompiled.html                                              |    4 
 docs/relnotes.html                                                 |    4 
 docs/science.html                                                  |    4 
 docs/sourcedocs.html                                               |    4 
 docs/subset.html                                                   |    4 
 docs/systems.html                                                  |    4 
 docs/thanks.html                                                   |    4 
 docs/utilities.html                                                |    4 
 docs/utility.html                                                  |    4 
 docs/webmaster.html                                                |    4 
 include/GL/gl.h                                                    |   12 
 include/GL/gl_mangle.h                                             |   95 
 include/GL/glext.h                                                 |  367 
 progs/demos/Makefile                                               |   55 
 progs/demos/arbfplight.c                                           |    6 
 progs/demos/arbocclude.c                                           |   11 
 progs/demos/bounce.c                                               |   23 
 progs/demos/cubemap.c                                              |    2 
 progs/demos/descrip.mms                                            |   16 
 progs/demos/drawpix.c                                              |    3 
 progs/demos/fire.c                                                 |   23 
 progs/demos/fogcoord.c                                             |    6 
 progs/demos/fplight.c                                              |    6 
 progs/demos/gears.c                                                |   11 
 progs/demos/geartrain.c                                            |   10 
 progs/demos/geartrain.dat                                          |    2 
 progs/demos/gloss.c                                                |   18 
 progs/demos/ipers.c                                                |   14 
 progs/demos/isosurf.c                                              |    2 
 progs/demos/lodbias.c                                              |    2 
 progs/demos/morph3d.c                                              |    9 
 progs/demos/multiarb.c                                             |    3 
 progs/demos/osdemo16.c                                             |   26 
 progs/demos/osdemo32.c                                             |   37 
 progs/demos/pixeltex.c                                             |    2 
 progs/demos/pointblast.c                                           |   16 
 progs/demos/readpix.c                                              |    3 
 progs/demos/reflect.c                                              |   14 
 progs/demos/renormal.c                                             |   10 
 progs/demos/shadowtex.c                                            |   10 
 progs/demos/spectex.c                                              |   22 
 progs/demos/spriteblast.c                                          |   12 
 progs/demos/teapot.c                                               |    3 
 progs/demos/terrain.c                                              |   18 
 progs/demos/texcyl.c                                               |   16 
 progs/demos/texobj.c                                               |    8 
 progs/demos/tunnel.c                                               |   25 
 progs/demos/tunnel2.c                                              |   27 
 progs/demos/winpos.c                                               |    2 
 progs/redbook/alpha3D.c                                            |   18 
 progs/redbook/double.c                                             |   15 
 progs/redbook/fog.c                                                |    4 
 progs/redbook/polys.c                                              |    2 
 progs/samples/Makefile                                             |   17 
 progs/samples/Makefile.DJ                                          |    9 
 progs/samples/Makefile.mgw                                         |    9 
 progs/samples/olympic.c                                            |   16 
 progs/samples/sphere.c                                             |   14 
 progs/samples/star.c                                               |   21 
 progs/samples/stretch.c                                            |   15 
 progs/samples/wave.c                                               |   19 
 progs/tests/Makefile                                               |    1 
 progs/tests/bufferobj.c                                            |    4 
 progs/tests/dinoshade.c                                            |   14 
 progs/tests/texobjshare.c                                          |  219 
 progs/util/descrip.mms                                             |   42 
 progs/xdemos/Makefile                                              |    3 
 progs/xdemos/glxcontexts.c                                         |  609 
 progs/xdemos/glxgears.c                                            |   49 
 progs/xdemos/pbinfo.c                                              |   29 
 progs/xdemos/pbutil.c                                              |  114 
 progs/xdemos/pbutil.h                                              |    4 
 progs/xdemos/shape.c                                               |   43 
 src/glu/mesa/Makefile                                              |    2 
 src/glu/sgi/Makefile                                               |    2 
 src/glut/dos/PC_HW/pc_hw.c                                         |  178 
 src/glut/dos/PC_HW/pc_hw.h                                         |    2 
 src/glut/dos/PC_HW/pc_irq.S                                        |    2 
 src/glut/dos/PC_HW/pc_keyb.c                                       |  592 
 src/glut/dos/PC_HW/pc_mouse.c                                      |  269 
 src/glut/dos/PC_HW/pc_timer.c                                      |  462 
 src/glut/dos/callback.c                                            |  183 
 src/glut/dos/color.c                                               |   29 
 src/glut/dos/extens.c                                              |   58 
 src/glut/dos/glutint.h                                             |   82 
 src/glut/dos/init.c                                                |  491 
 src/glut/dos/menu.c                                                |   63 
 src/glut/dos/mouse.c                                               |   27 
 src/glut/dos/overlay.c                                             |   60 
 src/glut/dos/state.c                                               |  276 
 src/glut/dos/util.c                                                |   52 
 src/glut/dos/window.c                                              |  335 
 src/glut/ggi/Makefile                                              |    2 
 src/glut/glx/Makefile                                              |    3 
 src/glut/mini/Makefile                                             |    2 
 src/glw/Makefile                                                   |    2 
 src/glx/mini/Makefile                                              |    2 
 src/glx/mini/miniglx.c                                             |   30 
 src/glx/x11/Makefile                                               |    7 
 src/glx/x11/XF86dri.c                                              |    2 
 src/glx/x11/compsize.c                                             |   22 
 src/glx/x11/glxclient.h                                            |   12 
 src/glx/x11/glxcmds.c                                              |    4 
 src/glx/x11/glxext.c                                               |   10 
 src/glx/x11/indirect.c                                             |  531 
 src/glx/x11/indirect.h                                             |    7 
 src/glx/x11/indirect_size.c                                        |   65 
 src/glx/x11/indirect_size.h                                        |   11 
 src/glx/x11/pixel.c                                                |   31 
 src/glx/x11/render2.c                                              |    2 
 src/glx/x11/renderpix.c                                            |  852 -
 src/glx/x11/single2.c                                              |   73 
 src/glx/x11/singlepix.c                                            |    4 
 src/glx/x11/size.h                                                 |   53 
 src/mesa/Makefile                                                  |   13 
 src/mesa/drivers/dri/Makefile                                      |    6 
 src/mesa/drivers/dri/Makefile.template                             |   18 
 src/mesa/drivers/dri/common/dri_util.c                             |   49 
 src/mesa/drivers/dri/common/dri_util.h                             |   16 
 src/mesa/drivers/dri/common/spantmp2.h                             |   12 
 src/mesa/drivers/dri/common/utils.c                                |   35 
 src/mesa/drivers/dri/common/utils.h                                |    5 
 src/mesa/drivers/dri/dri_client/Makefile                           |    2 
 src/mesa/drivers/dri/dri_client/xf86drmHash.c                      |   60 
 src/mesa/drivers/dri/dri_client/xf86drmRandom.c                    |   34 
 src/mesa/drivers/dri/dri_client/xf86drmSL.c                        |   70 
 src/mesa/drivers/dri/ffb/ffb_xmesa.c                               |    5 
 src/mesa/drivers/dri/ffb/ffb_xmesa.h                               |    4 
 src/mesa/drivers/dri/gamma/gamma_lock.h                            |    4 
 src/mesa/drivers/dri/gamma/gamma_macros.h                          |    4 
 src/mesa/drivers/dri/gamma/gamma_span.c                            |   14 
 src/mesa/drivers/dri/i810/i810span.c                               |    4 
 src/mesa/drivers/dri/i915/i830_context.c                           |    1 
 src/mesa/drivers/dri/i915/i830_reg.h                               |   45 
 src/mesa/drivers/dri/i915/i830_state.c                             |  204 
 src/mesa/drivers/dri/i915/i915_context.c                           |   62 
 src/mesa/drivers/dri/i915/i915_metaops.c                           |    6 
 src/mesa/drivers/dri/i915/i915_reg.h                               |   72 
 src/mesa/drivers/dri/i915/i915_state.c                             |  157 
 src/mesa/drivers/dri/i915/i915_tex.c                               |    7 
 src/mesa/drivers/dri/i915/i915_texprog.c                           |   13 
 src/mesa/drivers/dri/i915/i915_texstate.c                          |  240 
 src/mesa/drivers/dri/i915/intel_context.c                          |   24 
 src/mesa/drivers/dri/i915/intel_context.h                          |   59 
 src/mesa/drivers/dri/i915/intel_ioctl.c                            |    2 
 src/mesa/drivers/dri/i915/intel_screen.c                           |    1 
 src/mesa/drivers/dri/i915/intel_span.c                             |    4 
 src/mesa/drivers/dri/i915/intel_state.c                            |  127 
 src/mesa/drivers/dri/i915/intel_tex.c                              |   16 
 src/mesa/drivers/dri/mach64/mach64_context.h                       |    3 
 src/mesa/drivers/dri/mach64/mach64_dd.h                            |    3 
 src/mesa/drivers/dri/mach64/mach64_ioctl.h                         |    3 
 src/mesa/drivers/dri/mach64/mach64_lock.h                          |    3 
 src/mesa/drivers/dri/mach64/mach64_reg.h                           |    3 
 src/mesa/drivers/dri/mach64/mach64_screen.h                        |    3 
 src/mesa/drivers/dri/mach64/mach64_span.h                          |    3 
 src/mesa/drivers/dri/mach64/mach64_state.h                         |    3 
 src/mesa/drivers/dri/mach64/mach64_tex.h                           |    3 
 src/mesa/drivers/dri/mga/mga_xmesa.h                               |    3 
 src/mesa/drivers/dri/mga/mgaspan.c                                 |   14 
 src/mesa/drivers/dri/r128/r128_context.h                           |    3 
 src/mesa/drivers/dri/r128/r128_dd.h                                |    3 
 src/mesa/drivers/dri/r128/r128_ioctl.h                             |    3 
 src/mesa/drivers/dri/r128/r128_lock.h                              |    3 
 src/mesa/drivers/dri/r128/r128_screen.h                            |    3 
 src/mesa/drivers/dri/r128/r128_span.c                              |    2 
 src/mesa/drivers/dri/r128/r128_span.h                              |    3 
 src/mesa/drivers/dri/r128/r128_state.h                             |    3 
 src/mesa/drivers/dri/r128/r128_tex.h                               |    3 
 src/mesa/drivers/dri/r200/Makefile                                 |    6 
 src/mesa/drivers/dri/r200/r200_context.h                           |    3 
 src/mesa/drivers/dri/r200/r200_ioctl.c                             |    3 
 src/mesa/drivers/dri/r200/r200_ioctl.h                             |    6 
 src/mesa/drivers/dri/r200/r200_lock.c                              |    6 
 src/mesa/drivers/dri/r200/r200_lock.h                              |    3 
 src/mesa/drivers/dri/r200/r200_maos.h                              |    3 
 src/mesa/drivers/dri/r200/r200_pixel.h                             |    3 
 src/mesa/drivers/dri/r200/r200_reg.h                               |    2 
 src/mesa/drivers/dri/r200/r200_screen.c                            |   13 
 src/mesa/drivers/dri/r200/r200_screen.h                            |    4 
 src/mesa/drivers/dri/r200/r200_span.c                              |   70 
 src/mesa/drivers/dri/r200/r200_span.h                              |    3 
 src/mesa/drivers/dri/r200/r200_state.c                             |    3 
 src/mesa/drivers/dri/r200/r200_state.h                             |    3 
 src/mesa/drivers/dri/r200/r200_state_init.c                        |    4 
 src/mesa/drivers/dri/r200/r200_tcl.h                               |    4 
 src/mesa/drivers/dri/r200/r200_tex.h                               |    3 
 src/mesa/drivers/dri/r200/r200_vtxfmt.h                            |    4 
 src/mesa/drivers/dri/r300/Makefile                                 |    2 
 src/mesa/drivers/dri/r300/r200_context.h                           |    8 
 src/mesa/drivers/dri/r300/r300_cmdbuf.c                            |  169 
 src/mesa/drivers/dri/r300/r300_context.c                           |   28 
 src/mesa/drivers/dri/r300/r300_context.h                           |  167 
 src/mesa/drivers/dri/r300/r300_emit.h                              |   45 
 src/mesa/drivers/dri/r300/r300_fixed_pipelines.h                   |  314 
 src/mesa/drivers/dri/r300/r300_ioctl.c                             |   64 
 src/mesa/drivers/dri/r300/r300_reg.h                               |  257 
 src/mesa/drivers/dri/r300/r300_render.c                            |  282 
 src/mesa/drivers/dri/r300/r300_state.c                             |  825 -
 src/mesa/drivers/dri/r300/r300_state.h                             |    8 
 src/mesa/drivers/dri/r300/r300_tex.c                               |  171 
 src/mesa/drivers/dri/r300/r300_texmem.c                            |   25 
 src/mesa/drivers/dri/r300/r300_texstate.c                          |   75 
 src/mesa/drivers/dri/r300/r300_vertexprog.c                        |  552 
 src/mesa/drivers/dri/r300/radeon_context.h                         |   10 
 src/mesa/drivers/dri/r300/radeon_screen.c                          |    4 
 src/mesa/drivers/dri/r300/radeon_span.c                            |    2 
 src/mesa/drivers/dri/radeon/radeon_context.c                       |    1 
 src/mesa/drivers/dri/radeon/radeon_context.h                       |    4 
 src/mesa/drivers/dri/radeon/radeon_ioctl.c                         |   22 
 src/mesa/drivers/dri/radeon/radeon_ioctl.h                         |    6 
 src/mesa/drivers/dri/radeon/radeon_lock.c                          |    6 
 src/mesa/drivers/dri/radeon/radeon_lock.h                          |    3 
 src/mesa/drivers/dri/radeon/radeon_maos.h                          |    3 
 src/mesa/drivers/dri/radeon/radeon_screen.c                        |    8 
 src/mesa/drivers/dri/radeon/radeon_screen.h                        |    5 
 src/mesa/drivers/dri/radeon/radeon_span.c                          |   56 
 src/mesa/drivers/dri/radeon/radeon_span.h                          |    3 
 src/mesa/drivers/dri/radeon/radeon_state.c                         |    3 
 src/mesa/drivers/dri/radeon/radeon_state.h                         |    3 
 src/mesa/drivers/dri/radeon/radeon_state_init.c                    |    6 
 src/mesa/drivers/dri/radeon/radeon_tcl.h                           |    4 
 src/mesa/drivers/dri/radeon/radeon_tex.h                           |    3 
 src/mesa/drivers/dri/radeon/radeon_texmem.c                        |   10 
 src/mesa/drivers/dri/radeon/radeon_vtxfmt.h                        |    4 
 src/mesa/drivers/dri/radeon/server/radeon_reg.h                    |    1 
 src/mesa/drivers/dri/s3v/s3v_common.h                              |    8 
 src/mesa/drivers/dri/s3v/s3v_lock.h                                |    4 
 src/mesa/drivers/dri/s3v/s3v_macros.h                              |   18 
 src/mesa/drivers/dri/s3v/s3v_tex.h                                 |    4 
 src/mesa/drivers/dri/savage/Makefile                               |    1 
 src/mesa/drivers/dri/savage/savage_init.h                          |    3 
 src/mesa/drivers/dri/savage/savage_xmesa.c                         |  246 
 src/mesa/drivers/dri/savage/savagecontext.h                        |   42 
 src/mesa/drivers/dri/savage/savagedd.c                             |    2 
 src/mesa/drivers/dri/savage/savageioctl.c                          |   54 
 src/mesa/drivers/dri/savage/savageioctl.h                          |  116 
 src/mesa/drivers/dri/savage/savagerender.c                         |  394 
 src/mesa/drivers/dri/savage/savagespan.c                           |  114 
 src/mesa/drivers/dri/savage/savagestate.c                          |  115 
 src/mesa/drivers/dri/savage/savagetex.c                            |  674 
 src/mesa/drivers/dri/savage/savagetex.h                            |   96 
 src/mesa/drivers/dri/savage/savagetris.c                           |  507 
 src/mesa/drivers/dri/sis/sis_common2.h                             |    8 
 src/mesa/drivers/dri/sis/sis_dd.h                                  |    3 
 src/mesa/drivers/dri/sis/sis_span.c                                |   20 
 src/mesa/drivers/dri/sis/sis_span.h                                |    3 
 src/mesa/drivers/dri/sis/sis_state.h                               |    3 
 src/mesa/drivers/dri/sis/sis_stencil.h                             |    3 
 src/mesa/drivers/dri/sis/sis_tex.h                                 |    3 
 src/mesa/drivers/dri/tdfx/dri_glide.h                              |    3 
 src/mesa/drivers/dri/tdfx/tdfx_context.h                           |    4 
 src/mesa/drivers/dri/tdfx/tdfx_dd.h                                |    3 
 src/mesa/drivers/dri/tdfx/tdfx_lock.h                              |    5 
 src/mesa/drivers/dri/tdfx/tdfx_pixels.h                            |    3 
 src/mesa/drivers/dri/tdfx/tdfx_render.h                            |    4 
 src/mesa/drivers/dri/tdfx/tdfx_screen.h                            |    3 
 src/mesa/drivers/dri/tdfx/tdfx_span.h                              |    3 
 src/mesa/drivers/dri/tdfx/tdfx_state.c                             |    6 
 src/mesa/drivers/dri/tdfx/tdfx_state.h                             |    3 
 src/mesa/drivers/dri/tdfx/tdfx_tex.c                               |    9 
 src/mesa/drivers/dri/tdfx/tdfx_tris.c                              |   12 
 src/mesa/drivers/dri/tdfx/tdfx_vb.c                                |    8 
 src/mesa/drivers/dri/tdfx/tdfx_vb.h                                |    2 
 src/mesa/drivers/dri/unichrome/Makefile                            |    3 
 src/mesa/drivers/dri/unichrome/server/via_dri.c                    |  277 
 src/mesa/drivers/dri/unichrome/server/via_regs.h                   |   15 
 src/mesa/drivers/dri/unichrome/via_3d_reg.h                        |    8 
 src/mesa/drivers/dri/unichrome/via_common.h                        |  215 
 src/mesa/drivers/dri/unichrome/via_context.c                       |   67 
 src/mesa/drivers/dri/unichrome/via_context.h                       |   26 
 src/mesa/drivers/dri/unichrome/via_dri.h                           |    2 
 src/mesa/drivers/dri/unichrome/via_fb.c                            |   17 
 src/mesa/drivers/dri/unichrome/via_ioctl.c                         |  107 
 src/mesa/drivers/dri/unichrome/via_ioctl.h                         |   33 
 src/mesa/drivers/dri/unichrome/via_screen.c                        |   22 
 src/mesa/drivers/dri/unichrome/via_span.c                          |   96 
 src/mesa/drivers/dri/unichrome/via_state.c                         |  161 
 src/mesa/drivers/dri/unichrome/via_tex.c                           |   44 
 src/mesa/drivers/dri/unichrome/via_tex.h                           |    2 
 src/mesa/drivers/dri/unichrome/via_texcombine.c                    |  275 
 src/mesa/drivers/dri/unichrome/via_texmem.c                        |    1 
 src/mesa/drivers/dri/unichrome/via_texstate.c                      |  302 
 src/mesa/drivers/dri/unichrome/via_tris.c                          |  250 
 src/mesa/drivers/dri/unichrome/xf86drmVIA.c                        |  143 
 src/mesa/drivers/dri/unichrome/xf86drmVIA.h                        |  101 
 src/mesa/drivers/dri/x11/Makefile                                  |    2 
 src/mesa/drivers/glide/fxdd.c                                      |   23 
 src/mesa/drivers/glide/fxddtex.c                                   |   10 
 src/mesa/drivers/glide/fxdrv.h                                     |    6 
 src/mesa/drivers/glide/fxtexman.c                                  |   48 
 src/mesa/drivers/glide/fxtris.c                                    |  104 
 src/mesa/drivers/glide/fxvb.c                                      |   63 
 src/mesa/drivers/osmesa/osmesa.c                                   |   27 
 src/mesa/drivers/x11/fakeglx.c                                     |   50 
 src/mesa/drivers/x11/xm_api.c                                      |    2 
 src/mesa/glapi/Makefile                                            |   53 
 src/mesa/glapi/glX_XML.py                                          |  256 
 src/mesa/glapi/glX_doc.py                                          |  278 
 src/mesa/glapi/glX_proto_send.py                                   |  495 
 src/mesa/glapi/glX_proto_size.py                                   |  521 
 src/mesa/glapi/gl_API.xml                                          | 1908 +-
 src/mesa/glapi/gl_XML.py                                           |  232 
 src/mesa/glapi/gl_apitemp.py                                       |   14 
 src/mesa/glapi/gl_offsets.py                                       |   11 
 src/mesa/glapi/gl_procs.py                                         |   30 
 src/mesa/glapi/gl_table.py                                         |    6 
 src/mesa/glapi/gl_x86_asm.py                                       |   20 
 src/mesa/glapi/glapioffsets.h                                      |    9 
 src/mesa/glapi/glapitable.h                                        |    9 
 src/mesa/glapi/glapitemp.h                                         |   18 
 src/mesa/glapi/glprocs.h                                           |  362 
 src/mesa/main/bufferobj.c                                          |   18 
 src/mesa/main/context.c                                            |   22 
 src/mesa/main/dd.h                                                 |   18 
 src/mesa/main/depth.c                                              |   12 
 src/mesa/main/depth.h                                              |   10 
 src/mesa/main/descrip.mms                                          |    3 
 src/mesa/main/dlist.c                                              |  140 
 src/mesa/main/extensions.c                                         |    8 
 src/mesa/main/get.c                                                | 7704 ++++------
 src/mesa/main/get_gen.py                                           | 1151 +
 src/mesa/main/getstring.c                                          |  261 
 src/mesa/main/glheader.h                                           |   47 
 src/mesa/main/hash.c                                               |  158 
 src/mesa/main/hash.h                                               |   15 
 src/mesa/main/imports.h                                            |   16 
 src/mesa/main/main.dsp                                             |   48 
 src/mesa/main/mtypes.h                                             |  115 
 src/mesa/main/state.c                                              |    5 
 src/mesa/main/stencil.c                                            |  174 
 src/mesa/main/stencil.h                                            |   16 
 src/mesa/main/texformat_tmp.h                                      |   32 
 src/mesa/main/teximage.c                                           |    7 
 src/mesa/main/texobj.c                                             |   27 
 src/mesa/math/m_copy_tmp.h                                         |    2 
 src/mesa/shader/arbprogparse.c                                     |   10 
 src/mesa/shader/arbprogparse.h                                     |    6 
 src/mesa/shader/arbvertparse.c                                     |    4 
 src/mesa/shader/atifragshader.c                                    |   22 
 src/mesa/shader/descrip.mms                                        |    9 
 src/mesa/shader/program.c                                          |   20 
 src/mesa/shader/program.h                                          |   23 
 src/mesa/shader/shader.dsp                                         |  302 
 src/mesa/shader/shaderobjects.c                                    | 1048 +
 src/mesa/shader/shaderobjects.h                                    |   23 
 src/mesa/shader/shaderobjects_3dlabs.c                             |  775 +
 src/mesa/shader/shaderobjects_3dlabs.h                             |   37 
 src/mesa/shader/slang/Include/BaseTypes.h                          |  133 
 src/mesa/shader/slang/Include/Common.h                             |  285 
 src/mesa/shader/slang/Include/ConstantUnion.h                      |   50 
 src/mesa/shader/slang/Include/InfoSink.h                           |  135 
 src/mesa/shader/slang/Include/InitializeGlobals.h                  |   43 
 src/mesa/shader/slang/Include/InitializeParseContext.h             |   44 
 src/mesa/shader/slang/Include/PoolAlloc.h                          |  354 
 src/mesa/shader/slang/Include/ResourceLimits.h                     |   52 
 src/mesa/shader/slang/Include/ShHandle.h                           |  199 
 src/mesa/shader/slang/Include/Types.h                              |  223 
 src/mesa/shader/slang/Include/intermediate.h                       |  505 
 src/mesa/shader/slang/MachineIndependent/Gen_glslang.cpp           | 2822 +++
 src/mesa/shader/slang/MachineIndependent/Gen_glslang_tab.cpp       | 3666 ++++
 src/mesa/shader/slang/MachineIndependent/InfoSink.cpp              |  107 
 src/mesa/shader/slang/MachineIndependent/Initialize.cpp            |  868 +
 src/mesa/shader/slang/MachineIndependent/Initialize.h              |   56 
 src/mesa/shader/slang/MachineIndependent/IntermTraverse.cpp        |  243 
 src/mesa/shader/slang/MachineIndependent/Intermediate.cpp          | 2057 ++
 src/mesa/shader/slang/MachineIndependent/MMap.h                    |   84 
 src/mesa/shader/slang/MachineIndependent/ParseHelper.cpp           | 1406 +
 src/mesa/shader/slang/MachineIndependent/ParseHelper.h             |  137 
 src/mesa/shader/slang/MachineIndependent/PoolAlloc.cpp             |  348 
 src/mesa/shader/slang/MachineIndependent/QualifierAlive.cpp        |   91 
 src/mesa/shader/slang/MachineIndependent/QualifierAlive.h          |   35 
 src/mesa/shader/slang/MachineIndependent/RemoveTree.cpp            |   98 
 src/mesa/shader/slang/MachineIndependent/RemoveTree.h              |   35 
 src/mesa/shader/slang/MachineIndependent/ShaderLang.cpp            |  590 
 src/mesa/shader/slang/MachineIndependent/SymbolTable.cpp           |  156 
 src/mesa/shader/slang/MachineIndependent/SymbolTable.h             |  305 
 src/mesa/shader/slang/MachineIndependent/glslang_tab.h             |  121 
 src/mesa/shader/slang/MachineIndependent/intermOut.cpp             |  496 
 src/mesa/shader/slang/MachineIndependent/localintermediate.h       |   90 
 src/mesa/shader/slang/MachineIndependent/parseConst.cpp            |  345 
 src/mesa/shader/slang/MachineIndependent/preprocessor/atom.c       |  768 
 src/mesa/shader/slang/MachineIndependent/preprocessor/atom.h       |   96 
 src/mesa/shader/slang/MachineIndependent/preprocessor/compile.h    |  131 
 src/mesa/shader/slang/MachineIndependent/preprocessor/cpp.c        |  978 +
 src/mesa/shader/slang/MachineIndependent/preprocessor/cpp.h        |  118 
 src/mesa/shader/slang/MachineIndependent/preprocessor/cppstruct.c  |  184 
 src/mesa/shader/slang/MachineIndependent/preprocessor/memory.c     |  191 
 src/mesa/shader/slang/MachineIndependent/preprocessor/memory.h     |   89 
 src/mesa/shader/slang/MachineIndependent/preprocessor/parser.h     |  126 
 src/mesa/shader/slang/MachineIndependent/preprocessor/preprocess.h |   84 
 src/mesa/shader/slang/MachineIndependent/preprocessor/scanner.c    |  787 +
 src/mesa/shader/slang/MachineIndependent/preprocessor/scanner.h    |  118 
 src/mesa/shader/slang/MachineIndependent/preprocessor/slglobals.h  |  115 
 src/mesa/shader/slang/MachineIndependent/preprocessor/symbols.c    |  318 
 src/mesa/shader/slang/MachineIndependent/preprocessor/symbols.h    |  145 
 src/mesa/shader/slang/MachineIndependent/preprocessor/tokens.c     |  464 
 src/mesa/shader/slang/MachineIndependent/preprocessor/tokens.h     |  122 
 src/mesa/shader/slang/MachineIndependent/unistd.h                  |    1 
 src/mesa/shader/slang/OGLCompilersDLL/Initialisation.cpp           |  151 
 src/mesa/shader/slang/OGLCompilersDLL/Initialisation.h             |   47 
 src/mesa/shader/slang/OSDependent/Linux/osinclude.h                |   73 
 src/mesa/shader/slang/OSDependent/Linux/ossource.cpp               |  140 
 src/mesa/shader/slang/OSDependent/Windows/osinclude.h              |   68 
 src/mesa/shader/slang/OSDependent/Windows/ossource.cpp             |  123 
 src/mesa/shader/slang/Public/ShaderLang.h                          |  232 
 src/mesa/shader/slang/Public/ShaderLangExt.h                       |  189 
 src/mesa/shader/slang/library/slang_common_builtin.gc              | 1409 +
 src/mesa/shader/slang/library/slang_core.gc                        | 1751 ++
 src/mesa/shader/slang/library/slang_fragment_builtin.gc            |  366 
 src/mesa/shader/slang/library/slang_shader.syn                     | 1499 +
 src/mesa/shader/slang/library/slang_shader_syn.h                   |  754 
 src/mesa/shader/slang/library/slang_vertex_builtin.gc              |  262 
 src/mesa/shader/slang/slang_mesa.cpp                               |  144 
 src/mesa/shader/slang/slang_mesa.h                                 |   36 
 src/mesa/shader/slang/traverse_wrap.h                              |  112 
 src/mesa/shader/slang_common_builtin.gc                            | 1409 -
 src/mesa/shader/slang_core.gc                                      | 1751 --
 src/mesa/shader/slang_fragment_builtin.gc                          |  366 
 src/mesa/shader/slang_shader.syn                                   | 1499 -
 src/mesa/shader/slang_shader_syn.h                                 |  754 
 src/mesa/shader/slang_vertex_builtin.gc                            |  262 
 src/mesa/sources                                                   |   26 
 src/mesa/swrast/s_atifragshader.c                                  |    3 
 src/mesa/swrast/s_bitmap.c                                         |    2 
 src/mesa/swrast/s_fog.c                                            |    6 
 src/mesa/swrast/swrast.dsp                                         |    8 
 src/mesa/tnl/t_array_import.c                                      |    2 
 src/mesa/tnl/t_context.h                                           |    7 
 src/mesa/tnl/t_save_api.c                                          |   20 
 src/mesa/tnl/t_save_api.h                                          |    2 
 src/mesa/tnl/t_save_playback.c                                     |   11 
 src/mesa/tnl/t_vb_lighttmp.h                                       |   45 
 src/mesa/tnl/t_vb_normals.c                                        |    7 
 src/mesa/tnl/t_vb_texgen.c                                         |   89 
 src/mesa/tnl/t_vertex.c                                            |  371 
 src/mesa/tnl/t_vertex.h                                            |    1 
 src/mesa/tnl/t_vertex_c.c                                          |    8 
 src/mesa/tnl/t_vtx_api.c                                           |    4 
 src/mesa/tnl/t_vtx_exec.c                                          |    2 
 src/mesa/tnl/t_vtx_x86.c                                           |   16 
 src/mesa/tnl_dd/t_dd_dmatmp.h                                      |   55 
 src/mesa/tnl_dd/t_dd_tritmp.h                                      |   56 
 src/mesa/x86/Makefile                                              |    3 
 src/mesa/x86/assyntax.h                                            |    2 
 src/mesa/x86/common_x86.c                                          |   83 
 src/mesa/x86/glapi_x86.S                                           |  370 
 484 files changed, 49600 insertions(+), 19688 deletions(-)
---


More information about the Xquartz-changes mailing list