projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 84341f4 e5cf3aa)
Merge branch 'glsl2-head' into glsl2
authorEric Anholt <eric@anholt.net>
Thu, 24 Jun 2010 22:47:38 +0000 (15:47 -0700)
committerEric Anholt <eric@anholt.net>
Thu, 24 Jun 2010 22:47:40 +0000 (15:47 -0700)
This brings in the standalone GLSL compiler that we are planning on
replacing the existing Mesa GLSL compiler.  It currently targets GLSL
1.20 and the Mesa IR.


Trivial merge