Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / angle / src / libGLESv2 / Uniform.cpp

diff --git a/src/third_party/angle/src/libGLESv2/Uniform.cpp b/src/third_party/angle/src/libGLESv2/Uniform.cpp
index a5ab7cb..cddc7ec 100644 (file)
--- a/src/third_party/angle/src/libGLESv2/Uniform.cpp
+++ b/src/third_party/angle/src/libGLESv2/Uniform.cpp
@@ -13,7 +13,7 @@ namespace gl
 {
 
 LinkedUniform::LinkedUniform(GLenum type, GLenum precision, const std::string &name, unsigned int arraySize,
-                             const int blockIndex, const BlockMemberInfo &blockInfo)
+                             const int blockIndex, const sh::BlockMemberInfo &blockInfo)
     : type(type),
       precision(precision),
       name(name),
@@ -71,7 +71,7 @@ bool LinkedUniform::isInDefaultBlock() const
 size_t LinkedUniform::dataSize() const
 {
     ASSERT(type != GL_STRUCT_ANGLEX);
-    return UniformInternalSize(type) * elementCount();
+    return VariableInternalSize(type) * elementCount();
 }
 
 bool LinkedUniform::isSampler() const