Source/ThirdParty/ANGLE:
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 9 May 2019 04:49:11 +0000 (04:49 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 9 May 2019 04:49:11 +0000 (04:49 +0000)
Fix High Sierra and Windows builds.

* src/common/utilities.cpp:
(gl::priv::gLineModes):
* src/common/utilities.h:
(gl::IsLineMode):
Don't have a global constructor.  Use a function scoped static variable instead.
* GLESv2.cmake:
Renderer11.cpp was not building successfully on the bots.
I don't think it's needed, so just don't build it.

Source/WebCore:
Fix WPE build.

* CMakeLists.txt:
Bots wanted a "PUBLIC" or "PRIVATE" keyword here.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245090 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/ThirdParty/ANGLE/ChangeLog
Source/ThirdParty/ANGLE/GLESv2.cmake
Source/ThirdParty/ANGLE/src/common/utilities.cpp
Source/ThirdParty/ANGLE/src/common/utilities.h
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog

index 5471a36..d6dea57 100644 (file)
@@ -1,5 +1,18 @@
 2019-05-08  Alex Christensen  <achristensen@webkit.org>
 
+        Fix High Sierra and Windows builds.
+
+        * src/common/utilities.cpp:
+        (gl::priv::gLineModes):
+        * src/common/utilities.h:
+        (gl::IsLineMode):
+        Don't have a global constructor.  Use a function scoped static variable instead.
+        * GLESv2.cmake:
+        Renderer11.cpp was not building successfully on the bots.
+        I don't think it's needed, so just don't build it.
+
+2019-05-08  Alex Christensen  <achristensen@webkit.org>
+
         Fix High Sierra build.
 
         * src/libANGLE/State.cpp:
index c45aa99..7bdd2f2 100644 (file)
@@ -472,8 +472,6 @@ set(libangle_d3d11_sources
     src/libANGLE/renderer/d3d/d3d11/ProgramPipeline11.h
     src/libANGLE/renderer/d3d/d3d11/Query11.cpp
     src/libANGLE/renderer/d3d/d3d11/Query11.h
-    src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
-    src/libANGLE/renderer/d3d/d3d11/Renderer11.h
     src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp
     src/libANGLE/renderer/d3d/d3d11/renderer11_utils.h
     src/libANGLE/renderer/d3d/d3d11/RenderStateCache.cpp
index 84be990..295b8f1 100644 (file)
@@ -617,11 +617,16 @@ bool IsTriangleMode(PrimitiveMode drawMode)
 
 namespace priv
 {
-const angle::PackedEnumMap<PrimitiveMode, bool> gLineModes = {
-    {{PrimitiveMode::LineLoop, true},
-     {PrimitiveMode::LineStrip, true},
-     {PrimitiveMode::LineStripAdjacency, true},
-     {PrimitiveMode::Lines, true}}};
+const angle::PackedEnumMap<PrimitiveMode, bool>& gLineModes()
+{
+    static const angle::PackedEnumMap<PrimitiveMode, bool> modes {
+        { PrimitiveMode::LineLoop, true },
+        { PrimitiveMode::LineStrip, true },
+        { PrimitiveMode::LineStripAdjacency, true },
+        { PrimitiveMode::Lines, true }
+    };
+    return modes;
+};
 }  // namespace priv
 
 bool IsIntegerFormat(GLenum unsizedFormat)
index 9dcb06e..7a1429a 100644 (file)
@@ -78,12 +78,12 @@ bool IsTriangleMode(PrimitiveMode drawMode);
 
 namespace priv
 {
-extern const angle::PackedEnumMap<PrimitiveMode, bool> gLineModes;
+extern const angle::PackedEnumMap<PrimitiveMode, bool>& gLineModes();
 }  // namespace priv
 
 ANGLE_INLINE bool IsLineMode(PrimitiveMode primitiveMode)
 {
-    return priv::gLineModes[primitiveMode];
+    return priv::gLineModes()[primitiveMode];
 }
 
 bool IsIntegerFormat(GLenum unsizedFormat);
index e0fb489..e65a5e0 100644 (file)
@@ -1973,7 +1973,7 @@ add_dependencies(WebCoreTestSupport WebCore WebCoreTestSupportBindings)
 target_include_directories(WebCoreTestSupport PUBLIC ${WebCoreTestSupport_INCLUDE_DIRECTORIES} ${WebCore_INCLUDE_DIRECTORIES})
 target_include_directories(WebCoreTestSupport PRIVATE ${WebCoreTestSupport_PRIVATE_INCLUDE_DIRECTORIES} ${WebCore_PRIVATE_INCLUDE_DIRECTORIES})
 target_include_directories(WebCoreTestSupport SYSTEM PUBLIC ${WebCore_SYSTEM_INCLUDE_DIRECTORIES})
-target_link_libraries(WebCoreTestSupport ${WebCoreTestSupport_LIBRARIES})
+target_link_libraries(WebCoreTestSupport PRIVATE ${WebCoreTestSupport_LIBRARIES})
 
 if (WebCoreTestSupport_OUTPUT_NAME)
     set_target_properties(WebCoreTestSupport PROPERTIES OUTPUT_NAME ${WebCoreTestSupport_OUTPUT_NAME})
index 1b75a1e..d1ca81e 100644 (file)
@@ -1,5 +1,12 @@
 2019-05-08  Alex Christensen  <achristensen@webkit.org>
 
+        Fix WPE build.
+
+        * CMakeLists.txt:
+        Bots wanted a "PUBLIC" or "PRIVATE" keyword here.
+
+2019-05-08  Alex Christensen  <achristensen@webkit.org>
+
         Try to fix Linux build
 
         * platform/graphics/ANGLEWebKitBridge.h: