Fix WinCairo build break after r225340
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 1 Dec 2017 20:31:00 +0000 (20:31 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 1 Dec 2017 20:31:00 +0000 (20:31 +0000)
https://bugs.webkit.org/show_bug.cgi?id=180230

Unreviewed build fix.

Patch by Tomoki Imai <Tomoki.Imai@sony.com> on 2017-12-01

* CMakeLists.txt: Add missing sources.
* PlatformWin.cmake: Add missing sources.

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

Source/ThirdParty/ANGLE/CMakeLists.txt
Source/ThirdParty/ANGLE/ChangeLog
Source/ThirdParty/ANGLE/PlatformWin.cmake

index ce4468c..90de871 100644 (file)
@@ -1,7 +1,7 @@
 include_directories(
     .
     src
-    src/common/third_party/numerics
+    src/common/third_party/base
     include
     include/KHR
 )
@@ -50,9 +50,8 @@ set(ANGLE_SOURCES
     src/common/mathutil.cpp
     src/common/MemoryBuffer.cpp
     src/common/string_utils.cpp
-    src/common/system_utils_linux.cpp
-    src/common/system_utils_mac.cpp
     src/common/third_party/smhasher/src/PMurHash.cpp
+    src/common/third_party/base/anglebase/sha1.cc
     src/common/tls.cpp
     src/common/uniform_type_info_autogen.cpp
     src/common/utilities.cpp
index b6f992b..82ef956 100644 (file)
@@ -1,3 +1,13 @@
+2017-12-01  Tomoki Imai  <Tomoki.Imai@sony.com>
+
+        Fix WinCairo build break after r225340
+        https://bugs.webkit.org/show_bug.cgi?id=180230
+
+        Unreviewed build fix.
+
+        * CMakeLists.txt: Add missing sources.
+        * PlatformWin.cmake: Add missing sources.
+
 2017-12-01  Michael Catanzaro  <mcatanzaro@igalia.com>
 
         Unreviewed, fix -Wunknown-pragmas warnings.
index 212a585..3dcbf6f 100644 (file)
@@ -37,19 +37,49 @@ list(APPEND ANGLEGLESv2_LIBRARIES
 
 list(APPEND ANGLE_SOURCES
     src/common/system_utils_win.cpp
+    src/compiler/translator/AddDefaultReturnStatements.cpp
+    src/compiler/translator/ArrayReturnValueToOutParameter.cpp
     src/compiler/translator/ASTMetadataHLSL.cpp
+    src/compiler/translator/blocklayoutHLSL.cpp
     src/compiler/translator/BuiltInFunctionEmulatorHLSL.cpp
     src/compiler/translator/OutputHLSL.cpp
+    src/compiler/translator/RemoveDynamicIndexing.cpp
+    src/compiler/translator/RemoveSwitchFallThrough.cpp
+    src/compiler/translator/RewriteElseBlocks.cpp
     src/compiler/translator/SeparateArrayInitialization.cpp
+    src/compiler/translator/SeparateExpressionsReturningArrays.cpp
     src/compiler/translator/StructureHLSL.cpp
     src/compiler/translator/TextureFunctionHLSL.cpp
+    src/compiler/translator/ImageFunctionHLSL.cpp
     src/compiler/translator/TranslatorHLSL.cpp
+    src/compiler/translator/UnfoldShortCircuitToIf.cpp
     src/compiler/translator/UniformHLSL.cpp
     src/compiler/translator/UtilsHLSL.cpp
-    src/compiler/translator/blocklayoutHLSL.cpp
+    src/compiler/translator/WrapSwitchStatementsInBlocks.cpp
+    src/compiler/translator/emulated_builtin_functions_hlsl_autogen.cpp
     src/libANGLE/renderer/d3d/BufferD3D.cpp
     src/libANGLE/renderer/d3d/CompilerD3D.cpp
+    src/libANGLE/renderer/d3d/DeviceD3D.cpp
+    src/libANGLE/renderer/d3d/DisplayD3D.cpp
+    src/libANGLE/renderer/d3d/DynamicHLSL.cpp
+    src/libANGLE/renderer/d3d/EGLImageD3D.cpp
+    src/libANGLE/renderer/d3d/FramebufferD3D.cpp
+    src/libANGLE/renderer/d3d/HLSLCompiler.cpp
+    src/libANGLE/renderer/d3d/ImageD3D.cpp
+    src/libANGLE/renderer/d3d/IndexBuffer.cpp
+    src/libANGLE/renderer/d3d/IndexDataManager.cpp
+    src/libANGLE/renderer/d3d/NativeWindowD3D.cpp
+    src/libANGLE/renderer/d3d/ProgramD3D.cpp
+    src/libANGLE/renderer/d3d/RenderbufferD3D.cpp
+    src/libANGLE/renderer/d3d/RendererD3D.cpp
+    src/libANGLE/renderer/d3d/RenderTargetD3D.cpp
+    src/libANGLE/renderer/d3d/ShaderD3D.cpp
+    src/libANGLE/renderer/d3d/ShaderExecutableD3D.cpp
+    src/libANGLE/renderer/d3d/SurfaceD3D.cpp
     src/libANGLE/renderer/d3d/SwapChainD3D.cpp
+    src/libANGLE/renderer/d3d/TextureD3D.cpp
+    src/libANGLE/renderer/d3d/VertexBuffer.cpp
+    src/libANGLE/renderer/d3d/VertexDataManager.cpp
     src/libANGLE/renderer/d3d/d3d11/Blit11.cpp
     src/libANGLE/renderer/d3d/d3d11/Buffer11.cpp
     src/libANGLE/renderer/d3d/d3d11/Clear11.cpp
@@ -64,23 +94,24 @@ list(APPEND ANGLE_SOURCES
     src/libANGLE/renderer/d3d/d3d11/IndexBuffer11.cpp
     src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.cpp
     src/libANGLE/renderer/d3d/d3d11/PixelTransfer11.cpp
+    src/libANGLE/renderer/d3d/d3d11/ProgramPipeline11.cpp
     src/libANGLE/renderer/d3d/d3d11/Query11.cpp
-    src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp
     src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
+    src/libANGLE/renderer/d3d/d3d11/ResourceManager11.cpp
+    src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp
     src/libANGLE/renderer/d3d/d3d11/RenderStateCache.cpp
     src/libANGLE/renderer/d3d/d3d11/RenderTarget11.cpp
     src/libANGLE/renderer/d3d/d3d11/ShaderExecutable11.cpp
     src/libANGLE/renderer/d3d/d3d11/StateManager11.cpp
     src/libANGLE/renderer/d3d/d3d11/StreamProducerNV12.cpp
     src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp
-    src/libANGLE/renderer/d3d/d3d11/texture_format_table_autogen.cpp
-    src/libANGLE/renderer/d3d/d3d11/texture_format_table.cpp
     src/libANGLE/renderer/d3d/d3d11/TextureStorage11.cpp
     src/libANGLE/renderer/d3d/d3d11/TransformFeedback11.cpp
     src/libANGLE/renderer/d3d/d3d11/Trim11.cpp
+    src/libANGLE/renderer/d3d/d3d11/texture_format_table_autogen.cpp
+    src/libANGLE/renderer/d3d/d3d11/texture_format_table.cpp
     src/libANGLE/renderer/d3d/d3d11/VertexArray11.cpp
     src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.cpp
-    src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.cpp
     src/libANGLE/renderer/d3d/d3d9/Blit9.cpp
     src/libANGLE/renderer/d3d/d3d9/Buffer9.cpp
     src/libANGLE/renderer/d3d/d3d9/Context9.cpp
@@ -92,8 +123,8 @@ list(APPEND ANGLE_SOURCES
     src/libANGLE/renderer/d3d/d3d9/IndexBuffer9.cpp
     src/libANGLE/renderer/d3d/d3d9/NativeWindow9.cpp
     src/libANGLE/renderer/d3d/d3d9/Query9.cpp
-    src/libANGLE/renderer/d3d/d3d9/renderer9_utils.cpp
     src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp
+    src/libANGLE/renderer/d3d/d3d9/renderer9_utils.cpp
     src/libANGLE/renderer/d3d/d3d9/RenderTarget9.cpp
     src/libANGLE/renderer/d3d/d3d9/ShaderExecutable9.cpp
     src/libANGLE/renderer/d3d/d3d9/StateManager9.cpp
@@ -101,26 +132,7 @@ list(APPEND ANGLE_SOURCES
     src/libANGLE/renderer/d3d/d3d9/TextureStorage9.cpp
     src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.cpp
     src/libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.cpp
-    src/libANGLE/renderer/d3d/DeviceD3D.cpp
-    src/libANGLE/renderer/d3d/DisplayD3D.cpp
-    src/libANGLE/renderer/d3d/DynamicHLSL.cpp
-    src/libANGLE/renderer/d3d/EGLImageD3D.cpp
-    src/libANGLE/renderer/d3d/FramebufferD3D.cpp
-    src/libANGLE/renderer/d3d/HLSLCompiler.cpp
-    src/libANGLE/renderer/d3d/ImageD3D.cpp
-    src/libANGLE/renderer/d3d/IndexBuffer.cpp
-    src/libANGLE/renderer/d3d/IndexDataManager.cpp
-    src/libANGLE/renderer/d3d/NativeWindowD3D.cpp
-    src/libANGLE/renderer/d3d/ProgramD3D.cpp
-    src/libANGLE/renderer/d3d/RenderbufferD3D.cpp
-    src/libANGLE/renderer/d3d/RendererD3D.cpp
-    src/libANGLE/renderer/d3d/RenderTargetD3D.cpp
-    src/libANGLE/renderer/d3d/ShaderD3D.cpp
-    src/libANGLE/renderer/d3d/ShaderExecutableD3D.cpp
-    src/libANGLE/renderer/d3d/SurfaceD3D.cpp
-    src/libANGLE/renderer/d3d/TextureD3D.cpp
-    src/libANGLE/renderer/d3d/VertexBuffer.cpp
-    src/libANGLE/renderer/d3d/VertexDataManager.cpp
+    src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.cpp
     src/third_party/systeminfo/SystemInfo.cpp
 )