commit f257598999faf907a50d8a9f9eff28dad0ff2628
author Jamie Madill <jmadill@chromium.org> Wed Jun 25 16:04:54 2014 -0400
committer Jamie Madill <jmadill@chromium.org> Thu Jun 26 14:36:11 2014 +0000
tree d7b1c61d1ead0fca4e22f70a1405c566efe9e039
parent bb94f341d22734ab581d718513de0ce30a03440f

Use the sh namespace for shader variables.

Since these types originate from the translator, use an appropriate
namespace. Also rename some of the gl helper functions to be more
specific to their functionality.

BUG=angle:466

Change-Id: Idc29987b2053b3c40748dd46b581f3dbd8a6fd61
Reviewed-on: https://chromium-review.googlesource.com/204680
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Zhenyao Mo <zmo@chromium.org>

src/compiler/translator/util.cpp

diff --git a/src/compiler/translator/util.cpp b/src/compiler/translator/util.cpp
index f164325..bd13364 100644
--- a/src/compiler/translator/util.cpp
+++ b/src/compiler/translator/util.cpp
@@ -252,13 +252,13 @@
     return IsVaryingIn(qualifier) || IsVaryingOut(qualifier);
 }
 
-gl::InterpolationType GetInterpolationType(TQualifier qualifier)
+InterpolationType GetInterpolationType(TQualifier qualifier)
 {
     switch (qualifier)
     {
       case EvqFlatIn:
       case EvqFlatOut:
-        return gl::INTERPOLATION_FLAT;
+        return INTERPOLATION_FLAT;
 
       case EvqSmoothIn:
       case EvqSmoothOut:
@@ -266,14 +266,14 @@
       case EvqFragmentIn:
       case EvqVaryingIn:
       case EvqVaryingOut:
-        return gl::INTERPOLATION_SMOOTH;
+        return INTERPOLATION_SMOOTH;
 
       case EvqCentroidIn:
       case EvqCentroidOut:
-        return gl::INTERPOLATION_CENTROID;
+        return INTERPOLATION_CENTROID;
 
       default: UNREACHABLE();
-        return gl::INTERPOLATION_SMOOTH;
+        return INTERPOLATION_SMOOTH;
     }
 }