Changeset 205780 in webkit

Timestamp:

Sep 9, 2016 5:59:00 PM (8 years ago)

Author:

dino@apple.com

Message:

[ANGLE] instantiation of variable 'gl::GLTypeToGLenum<float>::value' required here, but no definition is available
​https://bugs.webkit.org/show_bug.cgi?id=161829
<rdar://problem/28051244>

Reviewed by Alex Christensen.

Newer versions of clang require explicit definition of some template types
if they are in another translation unit.

• src/libANGLE/Program.cpp: Add definitions for GLTypeToGLenum.

Location:

trunk/Source/ThirdParty/ANGLE

Files:

• ChangeLog (modified) (1 diff)
• src/libANGLE/Program.cpp (modified) (1 diff)

trunk/Source/ThirdParty/ANGLE/ChangeLog

@@ +1 @@
+2016-09-09  Dean Jackson  <dino@apple.com>
+
+        [ANGLE] instantiation of variable 'gl::GLTypeToGLenum<float>::value' required here, but no definition is available
+        https://bugs.webkit.org/show_bug.cgi?id=161829
+        <rdar://problem/28051244>
+
+        Reviewed by Alex Christensen.
+
+        Newer versions of clang require explicit definition of some template types
+        if they are in another translation unit.
+
+        * src/libANGLE/Program.cpp: Add definitions for GLTypeToGLenum.
+
 2016-07-29  David Kilzer  <ddkilzer@apple.com>
 

trunk/Source/ThirdParty/ANGLE/src/libANGLE/Program.cpp

@@ -2494 +2494 @@
 }
 
+extern template GLenum GLTypeToGLenum<float>::value;
+extern template GLenum GLTypeToGLenum<int>::value;
+extern template GLenum GLTypeToGLenum<unsigned int>::value;
+
 template <typename DestT>
 void Program::getUniformInternal(GLint location, DestT *dataOut) const