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/shaders/san-angeles-flat.vert | |
| 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/shaders/san-angeles-flat.vert')
| -rw-r--r-- | o3d/compiler/glsl_validator/shaders/san-angeles-flat.vert | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/o3d/compiler/glsl_validator/shaders/san-angeles-flat.vert b/o3d/compiler/glsl_validator/shaders/san-angeles-flat.vert new file mode 100644 index 0000000..4583d20 --- /dev/null +++ b/o3d/compiler/glsl_validator/shaders/san-angeles-flat.vert @@ -0,0 +1,8 @@ +attribute vec3 pos; +attribute vec4 colorIn; +uniform mat4 mvp; +varying vec4 color; +void main() { + color = colorIn; + gl_Position = mvp * vec4(pos.xyz, 1.); +} |