Use a static function instead of a static initializer for defaultBlockInfo.

src/common/shadervars.cpp

@@ -67,7 +67,10 @@ BlockMemberInfo::BlockMemberInfo(int offset, int arrayStride, int matrixStride,
 {
 }
 
-const BlockMemberInfo BlockMemberInfo::defaultBlockInfo(-1, -1, -1, false);
+BlockMemberInfo BlockMemberInfo::getDefaultBlockInfo()
+{
+    return BlockMemberInfo(-1, -1, -1, false);
+}
 
 InterfaceBlock::InterfaceBlock(const char *name, unsigned int arraySize, unsigned int registerIndex)
     : name(name),

src/common/shadervars.h

@@ -95,7 +95,7 @@ struct BlockMemberInfo
     int matrixStride;
     bool isRowMajorMatrix;
 
-    static const BlockMemberInfo defaultBlockInfo;
+    static BlockMemberInfo getDefaultBlockInfo();
 };
 
 typedef std::vector<BlockMemberInfo> BlockMemberInfoArray;

src/libGLESv2/ProgramBinary.cpp

@@ -1564,9 +1564,9 @@ bool ProgramBinary::link(InfoLog &infoLog, const AttributeBindings &attributeBin
     // special case for gl_DepthRange, the only built-in uniform (also a struct)
     if (vertexShader->usesDepthRange() || fragmentShader->usesDepthRange())
     {
-        mUniforms.push_back(new LinkedUniform(GL_FLOAT, GL_HIGH_FLOAT, "gl_DepthRange.near", 0, -1, gl::BlockMemberInfo::defaultBlockInfo));
-        mUniforms.push_back(new LinkedUniform(GL_FLOAT, GL_HIGH_FLOAT, "gl_DepthRange.far", 0, -1, gl::BlockMemberInfo::defaultBlockInfo));
-        mUniforms.push_back(new LinkedUniform(GL_FLOAT, GL_HIGH_FLOAT, "gl_DepthRange.diff", 0, -1, gl::BlockMemberInfo::defaultBlockInfo));
+        mUniforms.push_back(new LinkedUniform(GL_FLOAT, GL_HIGH_FLOAT, "gl_DepthRange.near", 0, -1, gl::BlockMemberInfo::getDefaultBlockInfo()));
+        mUniforms.push_back(new LinkedUniform(GL_FLOAT, GL_HIGH_FLOAT, "gl_DepthRange.far", 0, -1, gl::BlockMemberInfo::getDefaultBlockInfo()));
+        mUniforms.push_back(new LinkedUniform(GL_FLOAT, GL_HIGH_FLOAT, "gl_DepthRange.diff", 0, -1, gl::BlockMemberInfo::getDefaultBlockInfo()));
     }
 
     if (!linkUniformBlocks(infoLog, vertexShader->getInterfaceBlocks(), fragmentShader->getInterfaceBlocks()))
@@ -2012,7 +2012,7 @@ bool ProgramBinary::defineUniform(GLenum shader, const gl::Uniform &constant, In
     }
     else
     {
-        uniform = new LinkedUniform(constant.type, constant.precision, constant.name, constant.arraySize, -1, gl::BlockMemberInfo::defaultBlockInfo);
+        uniform = new LinkedUniform(constant.type, constant.precision, constant.name, constant.arraySize, -1, gl::BlockMemberInfo::getDefaultBlockInfo());
         uniform->registerElement = constant.elementIndex;
     }