diff options
| author | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-26 17:54:05 +0000 |
|---|---|---|
| committer | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-26 17:54:05 +0000 |
| commit | 46ef2ce78952914d3723b07aae28b024a1e8a6ad (patch) | |
| tree | 933865afee43064de6c883342408a0fa63122689 /o3d/compiler/glsl_validator/build.xml | |
| parent | 0908acd972c01bf7f3915575b5b53d78a0ee3c7b (diff) | |
| download | chromium_src-46ef2ce78952914d3723b07aae28b024a1e8a6ad.zip chromium_src-46ef2ce78952914d3723b07aae28b024a1e8a6ad.tar.gz chromium_src-46ef2ce78952914d3723b07aae28b024a1e8a6ad.tar.bz2 | |
Thanks to apatrick, added missing support to GLSL ES grammar for
user-defined types in constructor calls and type names. Allows
declarations of uniforms of struct types to parse. Added all shaders
from WebGL demos; all parse successfully. Fixed Ant build targets.
Attempted to make same changes to Bison version of grammar, but it is
not working well (failing to parse some function calls the ANTLR
version handles). Leaving it functionally unchanged. Cleaned up
comments.
Review URL: http://codereview.chromium.org/660160
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40129 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/compiler/glsl_validator/build.xml')
| -rw-r--r-- | o3d/compiler/glsl_validator/build.xml | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/o3d/compiler/glsl_validator/build.xml b/o3d/compiler/glsl_validator/build.xml index be53186..ee52a8c 100644 --- a/o3d/compiler/glsl_validator/build.xml +++ b/o3d/compiler/glsl_validator/build.xml @@ -10,13 +10,13 @@ <property name="build" value="build" /> <property name="test" value="test" /> <path id="antlr.classpath"> - <pathelement location="../../third_party/antlr3/lib/antlr-3.1.1.jar" /> + <pathelement location="../../../third_party/antlr3/lib/antlr-3.1.1.jar" /> </path> <path id="antlr.runtime.classpath"> - <pathelement location="../../third_party/antlr3/lib/antlr-runtime-3.1.1.jar" /> + <pathelement location="../../../third_party/antlr3/lib/antlr-runtime-3.1.1.jar" /> </path> <path id="test.classpath"> - <pathelement location="../../third_party/antlr3/lib/antlr-runtime-3.1.1.jar" /> + <pathelement location="../../../third_party/antlr3/lib/antlr-runtime-3.1.1.jar" /> <pathelement location="${build}" /> </path> </target> @@ -25,7 +25,7 @@ <mkdir dir="${build}" /> <mkdir dir="${build}/glsl_es" /> <!-- Run ANTLR on the grammar --> - <java classname="org.antlr.Tool"> + <java classname="org.antlr.Tool" failonerror="true"> <classpath refid="antlr.classpath" /> <arg value="glsl_es/GLSL_ES.g" /> <arg value="-fo" /> @@ -45,8 +45,28 @@ <arg value="shaders/ambient.frag" /> <arg value="shaders/diffuse.vert" /> <arg value="shaders/diffuse.frag" /> + <arg value="shaders/many-planets-deep.vert" /> + <arg value="shaders/many-planets-deep.frag" /> + <arg value="shaders/nvidia-vertex-buffer-object.vert" /> + <arg value="shaders/nvidia-vertex-buffer-object.frag" /> <arg value="shaders/texture_mapping.vert" /> <arg value="shaders/texture_mapping.frag" /> + <arg value="shaders/particles-2d.vert" /> + <arg value="shaders/particles-3d.vert" /> + <arg value="shaders/particles.frag" /> + <arg value="shaders/san-angeles-flat.vert" /> + <arg value="shaders/san-angeles-lit.vert" /> + <arg value="shaders/san-angeles-flat.frag" /> + <arg value="shaders/shiny-teapot.vert" /> + <arg value="shaders/shiny-teapot.frag" /> + <arg value="shaders/spirit-box.vert" /> + <arg value="shaders/spirit-box.frag" /> + <arg value="shaders/spore-view.vert" /> + <arg value="shaders/spore-view.frag" /> + <arg value="shaders/teapot-per-pixel.vert" /> + <arg value="shaders/teapot-per-pixel.frag" /> + <arg value="shaders/teapot-per-vertex.vert" /> + <arg value="shaders/teapot-per-vertex.frag" /> </java> </target> |