commit ce505553756bbebfa1e267bd1a4d6af8a96b9550
author Jamie Madill <jmadill@chromium.org> Thu Jun 26 14:56:33 2014 -0400
committer Jamie Madill <jmadill@chromium.org> Thu Jun 26 19:00:37 2014 +0000
tree 1a5fd01ca198f483fe7ecde762af4b866d5b28ff
parent 53221f5a0382887155d90f7f286e41190d4f5bfb

Revert "Return variable type queries using GLenum values."

Breaks the FYI bots until we get Chromium patched.

BUG=angle:466

This reverts commit 53221f5a0382887155d90f7f286e41190d4f5bfb.

Change-Id: Ib28548df5c10a6f76f46e4cf8f2013dca5cf0ee2
Reviewed-on: https://chromium-review.googlesource.com/205850
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

src/compiler/translator/ShaderLang.cpp

diff --git a/src/compiler/translator/ShaderLang.cpp b/src/compiler/translator/ShaderLang.cpp
index 903a5fb..121a68c 100644
--- a/src/compiler/translator/ShaderLang.cpp
+++ b/src/compiler/translator/ShaderLang.cpp
@@ -115,7 +115,7 @@
 //
 // Driver calls these to create and destroy compiler objects.
 //
-ShHandle ShConstructCompiler(sh::GLenum type, ShShaderSpec spec,
+ShHandle ShConstructCompiler(ShShaderType type, ShShaderSpec spec,
                              ShShaderOutput output,
                              const ShBuiltInResources* resources)
 {
@@ -293,7 +293,7 @@
                        int index,
                        size_t* length,
                        int* size,
-                       sh::GLenum* type,
+                       ShDataType* type,
                        ShPrecisionType* precision,
                        int* staticUse,
                        char* name,