Mesa (gallium-0.2): 83 new commits

Wed Jan 14 23:41:51 UTC 2009

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=658b1bdb1cc5f9910be910dc156a2e81ed999756
Merge: e82784559e00cb534993c01309ad1832e9b3e56b 03188b09e071ace9d9e21ccc56c01e90c0fa8639
Author: Alan Hourihane <alanh at vmware.com>
Date:   Wed Jan 14 23:33:41 2009 +0000

    Merge commit 'origin/master' into gallium-0.2
    
    Conflicts:
    	docs/install.html
    	docs/relnotes-7.3.html
    	src/mesa/shader/slang/slang_codegen.c
    	src/mesa/shader/slang/slang_compile.c
    	src/mesa/shader/slang/slang_emit.c
    	src/mesa/shader/slang/slang_preprocess.c
    	src/mesa/shader/slang/slang_preprocess.h

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=03188b09e071ace9d9e21ccc56c01e90c0fa8639
Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Wed Jan 14 12:46:06 2009 -0800

    intel: SW fallback maps texture images, not texture coordinates

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fae9604727c048834a7d5a90f8a652c86cff057a
Author: Brian Paul <brianp at vmware.com>
Date:   Wed Jan 14 12:16:00 2009 -0700

    glsl: propagate pragma info down into compiler from preprocessor

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=aac4a0509e6a5d8e3c8f8179519bcd21364ae18e
Author: Brian Paul <brianp at vmware.com>
Date:   Wed Jan 14 12:07:25 2009 -0700

    windows: remove reference to swizzle.c file

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b5f89e5f17bdf718d1f1f29e7a10dee3809c9f29
Author: Brian Paul <brianp at vmware.com>
Date:   Wed Jan 14 11:58:45 2009 -0700

    glsl: simplify IR storage for samplers
    
    Don't overload the Size field with the texture target, to avoid confusion.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c12d24b513a67648c30bf892964f887fad71e103
Author: Brian Paul <brianp at vmware.com>
Date:   Wed Jan 14 11:50:32 2009 -0700

    mesa: fix incorrect transformation of GL_SPOT_DIRECTION
    
    This was changed between GL 1.0 and 1.1.  Mesa still had the 1.0 behaviour.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2549c26a8b1eec21bdd8f45d3b3dd06e17ac82ae
Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Wed Jan 14 10:05:40 2009 -0800

    Treat image units and coordinate units differently.
    
    Previously MaxTextureUnits was used to validate both texture image
    units and texture coordinate units in fragment programs.  Instead, use
    MaxTextureCoordUnits for texture coordinate units and
    MaxTextureImageUnits for texture image units.
    
    Fixes bugzilla #19468.
    
    Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
    Reviewed-by: Brian Paul <brianp at vmware.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a98dccca36027fc0ed333075ab30176144e6c475
Author: Alan Hourihane <alanh at vmware.com>
Date:   Wed Jan 14 16:32:44 2009 +0000

    glsl: fix regression from sampler arrays commit

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1b3e3e6b841535b78ff4fa1d3861e9d8cdeff972
Author: Brian Paul <brianp at vmware.com>
Date:   Wed Jan 14 08:33:45 2009 -0700

    i965: indentation fixes

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=49b53407c7c4f08b5e13591fd04080ca602fba40
Author: Brian Paul <brianp at vmware.com>
Date:   Tue Jan 13 10:40:19 2009 -0700

    i965: allow larger AA points on fallback path

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d911e3e24fbfb5cd28cabb92f952775b7eb1d1d9
Author: Brian Paul <brianp at vmware.com>
Date:   Tue Jan 13 10:38:15 2009 -0700

    i965: fix indentation

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=658ab3c3ae4c99e841a6639f6d012c23deeb5371
Author: Brian Paul <brianp at vmware.com>
Date:   Tue Jan 13 10:26:25 2009 -0700

    i965: comment for emit_kil()

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8f7349dbb46e1ec6d8194a42753e83c1913944bc
Author: Brian Paul <brianp at vmware.com>
Date:   Tue Jan 13 10:20:15 2009 -0700

    mesa: put _NV suffix on a few opcodes

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d687476eddf96ba172d6d63b9cb4a091ce358b1a
Author: Brian Paul <brianp at vmware.com>
Date:   Tue Jan 13 10:09:02 2009 -0700

    i965: fix indentation

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c157a5bb9131dc95f2e5519fda19cf8c3567543a
Author: Xiang, Haihao <haihao.xiang at intel.com>
Date:   Wed Jan 14 09:32:55 2009 +0800

    intel: bump driver date

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=14eca6b573f70485feb6dc6bc048843e1b65e780
Author: Alan Hourihane <alanh at vmware.com>
Date:   Tue Jan 13 23:59:18 2009 +0000

    glsl: fix a comment typo

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ef0e0f2550b8bc63972ee53a80578b19ff2a5bbc
Author: Alan Hourihane <alanh at vmware.com>
Date:   Tue Jan 13 23:54:46 2009 +0000

    glsl: support sampler arrays.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=34d17d2bdc3da2fe8b669adc166f3ee07ad11391
Author: Brian Paul <brianp at vmware.com>
Date:   Tue Jan 13 15:09:13 2009 -0700

    docs: #pragma now handled

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=01a0938776ad12e6560a17163bb7a6a3da9e9820
Author: Brian Paul <brianp at vmware.com>
Date:   Tue Jan 13 15:06:52 2009 -0700

    glsl: add preprocessor support for #pragma
    
    Two forms are supported:
    
    Pragmas are silently ignored at this time.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1f47388dfebf15f610993f046e1f945024c8fc3c
Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Fri Jan 9 18:28:38 2009 -0800

    Add language about implicit flush and command completion
    
    Copied language from the glXSwapBuffers manual page about the implicit
    glFlush and expected command completion.  This just codifies what
    people already expect from glXCopySubBufferMESA.  The intention of
    this command is to work like glXSwapBuffers but on a sub-rectangle of
    the drawable.
    
    Acked-by: Brian Paul <brianp at vmware.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=34500a6da565f769e55babc6d28c14f606e2d52a
Author: Brian Paul <brianp at vmware.com>
Date:   Tue Jan 13 09:03:43 2009 -0700

    docs: fixes since 7.3-rc1

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=00c02626d8087cab0cf5581911c4e68f7b32eb6e
Author: Karl Schultz <karl.w.schultz at gmail.com>
Date:   Tue Jan 13 09:01:34 2009 -0700

    windows: try to create a context in wglCreateLayerContext()

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=eeeed45c2cf6c876d79ae20a9a96172ece8642fe
Author: Brian Paul <brianp at vmware.com>
Date:   Mon Jan 12 15:47:36 2009 -0700

    i965: fix glDrawPixels Z coordinate in intel_texture_drawpixels().
    
    As for glBitmap, it needs to be an NDC coord in [-1,1].

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3a5463d158eff483a992c9792d771fb80db9aed0
Author: Brian Paul <brianp at vmware.com>
Date:   Mon Jan 12 15:43:54 2009 -0700

    i965: fix broken glBitmap + depth test
    
    When we use the do_blit_bitmap() function, it seems the fragment Z is always
    1.0.  If depth testing is on, that means that bitmap fragments are often
    occluded by other rendering.  So, the bitmap doesn't appear even if
    rasterpos.Z==0.
    The fix is to use the intel_texture_bitmap() path when depth testing is on.
    Also, fix the incorrect Z coordinate.  It needs to be an NDC value in [-1,1].

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=de35989cdec9807c60b2b4389e5988037ce23d95
Author: Brian Paul <brianp at vmware.com>
Date:   Fri Jan 9 15:52:04 2009 -0700

    i965: fix broken ARB fp fog options
    
    Just call _mesa_append_fog_code() if the fragment program's FogOption is
    not GL_NONE.
    This allows us to remove some unnecessary i965 fog code.
    Note, the arbfplight.c demo can be used to test this (see DO_FRAGMENT_FOG).

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=29f603a270da711a2a980cc9896e5883e59227cd
Author: Dan Nicholson <dbn.lists at gmail.com>
Date:   Mon Jan 12 11:10:31 2009 -0800

    autoconf: Only _GNU_SOURCE feature test macro needed on gnu systems
    
    According to feature_test_macros(7), _GNU_SOURCE encompasses all the
    other feature macros we were setting, so we can just dispose of them.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7f7fc3e3af6471a224a10bf3d2cd6ddd7a96d334
Author: Julien Cristau <jcristau at debian.org>
Date:   Mon Jan 12 16:04:32 2009 +0100

    mesa: match against *-gnu* instead of *-gnu in configure.ac
    
    Fixes build on arm-linux-gnueabi

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a0318d7f8eea286a99c8fd6afb4d71b66d2b341c
Author: Thomas Henn <thomas.henn at igd.fraunhofer.de>
Date:   Mon Jan 12 10:56:42 2009 -0700

    windows: updated VC8 project files

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=06fdb6a74cfdddb5f598ddfeab890c59f176dab8
Author: Brian Paul <brianp at vmware.com>
Date:   Mon Jan 12 08:52:54 2009 -0700

    glsl: better fix for for-loop scope issue (commit 6333005f7aea3e5d1d86a5c47b3fa2a1ed2f3ff0)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=88fdddcbbe690c52f91f76216298700c370f9650
Author: Brian Paul <brianp at vmware.com>
Date:   Mon Jan 12 08:35:53 2009 -0700

    windows: added new sources for 7.3 (may be more, needs testing)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1598be5083758c1c289be16ee01665865ed0fb62
Author: Brian Paul <brianp at vmware.com>
Date:   Mon Jan 12 07:55:14 2009 -0700

    mesa: add osmesa.pc.in to tarball list

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=436024561aa6d78f78601f690803bd3845d225e7
Author: Matthieu Herrb <matthieu.herrb at laas.fr>
Date:   Sun Jan 11 16:56:34 2009 -0700

    Build fixes for gcc 2.95

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0f0922f93cbe997a95575c955ab1544bb5cd1d7d
Author: Matthieu Herrb <matthieu.herrb at laas.fr>
Date:   Sat Oct 11 08:51:43 2008 +0200

    Big endian fixes.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=33f6dc3c334cc065d7c98d0481be19b208e1837d
Author: Matthieu Herrb <matthieu.herrb at laas.fr>
Date:   Sun Sep 21 10:56:57 2008 +0200

    build fix on big endian OpenBSD architectures.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=356428d4e4dba433b405f63ff918d76eaf4b4215
Author: Matthieu Herrb <matthieu.herrb at laas.fr>
Date:   Sun Sep 14 20:58:29 2008 +0200

    replace nearbyint() by rint() for now.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b4866f8a5229d4769a49b4c54a1675a61497d206
Author: Owain G. Ainsworth <oga at openbsd.org>
Date:   Sun Jan 11 20:40:07 2009 +0000

    Fix build with GCC 2.95.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=297a9606ead4400a60a1b5106327c226db4b3474
Author: Matthieu Herrb <matthieu.herrb at laas.fr>
Date:   Sat Sep 13 19:07:28 2008 +0200

    __builtin_expect is a gcc 3.x feature. define it out for gcc 2.95.
    
    Patch suggested by miod at . Thanks.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=44557bf065b89abc45c24829c6ba7395925463e8
Author: Brian <brianp at vmware.com>
Date:   Sat Jan 10 16:32:32 2009 -0700

    mesa: require libdrm 2.4.3 in configure.ac

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f1455ca5f411ee8f7d992682e3e9c55d82e75715
Author: Brian Paul <brianp at vmware.com>
Date:   Sat Jan 10 12:21:37 2009 -0700

    mesa: omit old headers from tarball

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=834db8215362ca859ad4ef18441936238d1b6670
Author: Brian Paul <brianp at vmware.com>
Date:   Sat Jan 10 12:09:08 2009 -0700

    docs: document deprecated/removed headers/interfaces

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ef193c10e7b3f048abf5fce0d7dc4d72d94ba123
Author: Brian Paul <brianp at vmware.com>
Date:   Sat Jan 10 12:07:58 2009 -0700

    mesa: remove old GLView.h header for BeOS

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c3a00a728b15a13a33a38c8687ed6732c98d2260
Author: Brian Paul <brianp at vmware.com>
Date:   Sat Jan 10 12:06:29 2009 -0700

    mesa: remove deprecated headers from Makefile.am

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=287102ddcc72ae19f7e6b912205805c5e78771f7
Author: Brian Paul <brianp at vmware.com>
Date:   Sat Jan 10 12:04:39 2009 -0700

    mesa: deprecate GL/amesa.h header (allegro driver)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f5979b0c159d1d3839caf86072639f5d96a5b0b5
Author: Brian Paul <brianp at vmware.com>
Date:   Sat Jan 10 12:01:40 2009 -0700

    mesa: deprecate the GL/fxmesa.h header

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d25cc16efa356a92f61f0b4836bcbd0b4cb606d2
Author: Brian Paul <brianp at vmware.com>
Date:   Sat Jan 10 12:00:27 2009 -0700

    mesa: remove the ancient include/GL/ugl*.h headers

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1636328b0adefcebcc204d63980184a6d592efae
Author: Brian Paul <brianp at vmware.com>
Date:   Sat Jan 10 11:57:13 2009 -0700

    xmesa: deprecate the "XMesa" interface
    
    Move the include/GL/xmesa*.h files to src/mesa/drivers/x11/ so they're no
    longer considered public.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2c56dd775771d9d5ea2e22cf4ee4b5dbbbb2a03d
Author: Brian Paul <brianp at vmware.com>
Date:   Sat Jan 10 11:52:55 2009 -0700

    docs: prerequisite updates

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6333005f7aea3e5d1d86a5c47b3fa2a1ed2f3ff0
Author: Brian Paul <brianp at vmware.com>
Date:   Sat Jan 10 11:40:20 2009 -0700

    glsl: force creation of new scope for for-loop body
    
    Fixes regression in progs/demos/convolution.c due to loop unrolling.
    This also allows the following to be compiled correctly:
    for (int i = 0; i < n; i++) {
       int i;
       ...
    }
    This fix is a bit of a hack, however.  The better fix would be to change
    the slang_shader.syn grammar.  Will revisit that...

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1d352b42a106ed0c3cd0831fa681d07794b7ff3d
Author: Brian Paul <brianp at vmware.com>
Date:   Sat Jan 10 11:39:05 2009 -0700

    glsl: replace 0/1 with GL_FALSE/GL_TRUE

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9939a306f7dc109d301e7b2d6abf4f2ab019bde0
Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Fri Jan 9 13:56:44 2009 -0800

    swrast: Fix GL_ATI_separate_stencil
    
    GL_ATI_separate_stencil is enabled by default for software
    rasterizers, but the extension functions weren't hooked up to the
    dispatch table.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ca03e881a8d8fa3e36a601238559c20311373633
Author: Brian Paul <brianp at vmware.com>
Date:   Fri Jan 9 09:59:49 2009 -0700

    glsl: make minimum struct size = 2, not 1
    
    1-component structs such as "struct foo { float x; }" could get placed at
    any position within a register.  This caused some trouble computing the
    field offset which assumed all struct objects were placed at R.x.
    It would be unusual to hit this case in normal shaders.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4497a5a57d0fdb5c5ec15750e477aeb49f5e453d
Author: Brian Paul <brianp at vmware.com>
Date:   Thu Jan 8 17:21:20 2009 -0700

    mesa: 7.3-rc-1 Makefile changes

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f7b4c2cca9ea9013f527b25ae45605047c58d64c
Author: Brian Paul <brianp at vmware.com>
Date:   Thu Jan 8 17:20:41 2009 -0700

    mesa: latest glxext.h header, no version change

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=08fdc741bc509c284532d0e2fec32980c3047aec
Author: Brian Paul <brianp at vmware.com>
Date:   Thu Jan 8 17:20:18 2009 -0700

    mesa: import glext.h version 44

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d0c2cbd2571dba66463a37222d058f4394ba0918
Author: Brian Paul <brianp at vmware.com>
Date:   Thu Jan 8 17:19:51 2009 -0700

    docs: dri2proto, libdrm tweaks

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=acd99f67cc04ae249e35a9d80de12c0af012e4fc
Author: Brian Paul <brianp at vmware.com>
Date:   Thu Jan 8 17:07:28 2009 -0700

    glsl: fix typo in the vec2 += operator function

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0713e9da73cebfc35550ab192f385b955eb8ebcd
Author: Brian Paul <brianp at vmware.com>
Date:   Thu Jan 8 16:16:36 2009 -0700

    mesa: set version string to 7.3-rc1

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2c0ce92e8af4aab75f9a69a7913a1bec705220f3
Author: Brian Paul <brianp at vmware.com>
Date:   Thu Jan 8 16:15:31 2009 -0700

    docs: updated Cell docs, from gallium-0.2 branch

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1ed9b1ec90a0d641c12a0e7f613e588cf612fb5d
Author: Brian Paul <brianp at vmware.com>
Date:   Thu Jan 8 16:14:19 2009 -0700

    docs: more 7.3 doc updates

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=11ade9a3d1725075ef618a025f5494402dbc0053
Author: Brian Paul <brianp at vmware.com>
Date:   Thu Jan 8 16:12:23 2009 -0700

    docs: import 7.2 relnotes, start on 7.3 relnotes

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=730a407ca288bdd0120b9bb436ae716bfb9415f5
Author: Brian Paul <brianp at vmware.com>
Date:   Thu Jan 8 15:32:02 2009 -0700

    glsl: fix broken +=, -=, *=, /= operators
    
    These functions need to return the final computed value.
    Now expressions such as a = (b += c) work properly.
    Also, no need to use __asm intrinsics in these functions.  The resulting
    code is the same when using ordinary arithmetic operators and is more legible.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=19c877c3278f5bfc48f55b2ee35ec5f6769e4c90
Author: Brian Paul <brianp at vmware.com>
Date:   Wed Jan 7 12:31:14 2009 -0700

    mesa: fix off-by-one bug in _mesa_delete_instructions()

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=83a74521cfd2e81dd98ee1d84aff42a660613740
Author: Eric Anholt <eric at anholt.net>
Date:   Wed Jan 7 16:56:02 2009 -0800

    i965: Fix GLSL FS DPH to return the right value instead of src0.w * src1.w.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6d2cf395f401b53da1c2fc4485a297fd975637c6
Author: Eric Anholt <eric at anholt.net>
Date:   Wed Jan 7 14:26:11 2009 -0800

    i965: Remove worrisome comment about _NEW_PROGRAM signaling fp change.
    
    Everything now depends on either BRW_NEW_FRAGMENT_PROGRAM or
    BRW_NEW_VERTEX_PROGRAM.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8fb727548a652c47d8cf9593e2ae412ef2040119
Author: Eric Anholt <eric at anholt.net>
Date:   Wed Jan 7 14:09:07 2009 -0800

    mesa: Remove _Active and _UseTexEnvProgram flags from fragment programs.
    
    There was a note in state.c about _Active deserving to die, and there were
    potential issues with it due to i965 forgetting to set _UseTexEnvProgram.
    Removing both simplifies things.
    
    Reviewed-by: Brian Paul <brianp at vmware.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b9b482bd8de366289158a916e16414c5a74819c9
Author: Eric Anholt <eric at anholt.net>
Date:   Wed Jan 7 13:52:51 2009 -0800

    i965: Remove dead brw_vs_tnl.c

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f68f94c2bc950405d4c91a1e5582a35ff4b15bdf
Author: Brian Paul <brianp at vmware.com>
Date:   Wed Jan 7 18:45:49 2009 -0700

    i965: allow gl_FragData[0] usage when there's only one color buffer
    
    If gl_FragData[0] is written but not gl_FragCOlor, use the former.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bc7d2c4f51c56787b261e6ab6f9a77d39c3493e1
Author: Brian Paul <brianp at vmware.com>
Date:   Wed Jan 7 18:44:41 2009 -0700

    mesa: additional case in file_string()

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9629be5e07dc1d2b69cf7a761a6bb3ac0ec26453
Author: Brian Paul <brianp at vmware.com>
Date:   Wed Jan 7 18:44:00 2009 -0700

    glsl: pass GLcontext::Extension info down into GLSL preprocessor
    
    Now the #extension directives can be handled properly.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=176464b14b8ec2a248aed95df087e47749c851fa
Author: Brian Paul <brianp at vmware.com>
Date:   Wed Jan 7 18:41:54 2009 -0700

    glsl: bump up MAX_FOR_LOOP_UNROLL_COMPLEXITY

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d1860bcd0ade44a884ac1b7e0c5b2bef8ed6afcb
Author: Brian Paul <brianp at vmware.com>
Date:   Wed Jan 7 18:22:56 2009 -0700

    glsl: check that the fragment shader does not write both gl_FragColor and gl_FragData[]

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=95fa98d61a857448e690a0671b2e1e1d2873f0ec
Author: Brian Paul <brianp at vmware.com>
Date:   Wed Jan 7 15:06:06 2009 -0700

    i965: init dst reg RelAddr field to zero

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8112c9e2cc5b27a2b7fd1641c03d3660f992dabf
Author: Eric Anholt <eric at anholt.net>
Date:   Wed Jan 7 12:38:34 2009 -0800

    i965: Note when we drop saturate mode on the floor in a VP.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f53d9913ac8efa5cefa428eb21f91298aca78293
Author: Eric Anholt <eric at anholt.net>
Date:   Wed Jan 7 12:37:58 2009 -0800

    i965: Add support for LRP in VPs.
    
    Bug #19226.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b3c7f7466c068a5eaeb5adf981b6f776560bb6c9
Author: José Fonseca <jfonseca at vmware.com>
Date:   Wed Jan 7 12:02:06 2009 +0000

    mesa: Add _mesa_snprintf.
    
    On Windows snprintf is renamed as _snprintf.
    
    (cherry picked from commit f8f9a1b620d31d1a59855fd502caed325d4a324f)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=510ed7f51e0a198029835e4d88a1364179c2745c
Author: Brian Paul <brianp at vmware.com>
Date:   Wed Jan 7 08:56:10 2009 -0700

    glsl: disable some unused functions (but don't remove just yet)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a8542200b306f06d40d3944c42bc9634f425c8b0
Author: Brian Paul <brianp at vmware.com>
Date:   Wed Jan 7 08:54:09 2009 -0700

    glsl: also unroll loops with variable declarations such as "for (int i = 0; ..."

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cea7f7b76365dc41ba0e577d992193997b4f246f
Author: Brian Paul <brianp at vmware.com>
Date:   Wed Jan 7 08:32:21 2009 -0700

    glsl: remove dead code

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1a414a4dbe382b972061f3dc20ca648d1e8332b3
Author: Brian Paul <brianp at vmware.com>
Date:   Wed Jan 7 08:25:59 2009 -0700

    mesa: OSMesa Makefile fixes (use LIB_DIR)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0b0d0dcdef2b914dceb30a8e9a80f403b0311efc
Author: Brian Paul <brianp at vmware.com>
Date:   Tue Jan 6 17:36:20 2009 -0700

    glsl: loop unroll adjustments
    
    Add a "max complexity" heuristic to allow unrolling long loops with small
    bodies and short loops with large bodies.
    
    The loop unroll limits may need further tweaking...

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1fa978c8911d00e7cac0a114110e98ebdbe4d57d
Author: Brian Paul <brianp at vmware.com>
Date:   Tue Jan 6 17:24:23 2009 -0700

    glsl: implement loop unrolling for simple 'for' loops
    
    Loops such as this will be unrolled:
      for (i = 0; i < 4; ++i) {
          body;
      }
    where 'body' isn't too large.
    
    This also helps to fix the issue reported in bug #19190.  The problem there
    is indexing vector types with a variable index.  For example:
      vec4 v;
      v[2] = 1.0;  // equivalent to v.z = 1.0
      v[i] = 2.0;  // variable index into vector!!
    
    Since the for-i loop can be unrolled, we can avoid the problems associated
    with variable indexing into a vector (at least in this case).

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=338ae34d227fce8b6f358ca90d383d0cfb87c868
Author: Brian Paul <brianp at vmware.com>
Date:   Tue Jan 6 14:28:49 2009 -0700

    mesa: Move var declaration to top of scope.
    
    (cherry picked from commit 3740a06e28f4cd09e2a3dce2da60320aa9304df1)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=814bc5ccda51009327b6b5ff0fc2c088d537a636
Author: Brian Paul <brianp at vmware.com>
Date:   Tue Jan 6 14:21:27 2009 -0700

    mesa: fix GL_DEPTH_CLEAR_VALUE casting
    
    (cherry picked from commit d14d494dcda3d80ec2cf452551c680ffb432e306)