Bug 180230 – [WinCairo][ANGLE] Build fix after r225340

• Component: WebGL
• Status: RESOLVED FIXED

[Fujii Hironori]

Bug 180177 breaks WinCairo builds.

https://build.webkit.org/builders/WinCairo%2064-Bit%20Release/builds/8800

> CMake Error at Source/ThirdParty/ANGLE/CMakeLists.txt:312 (add_library):
>   Cannot find source file:
> 
>     src/libGLESv2/entry_points_gles_2_0.cpp
> 
>   Tried extensions .c .C .c++ .cc .cpp .cxx .m .M .mm .h .hh .h++ .hm .hpp
>   .hxx .in .txx
> 
> 
> CMake Error at Source/ThirdParty/ANGLE/CMakeLists.txt:315 (add_library):
>   Cannot find source file:
> 
>     src/third_party/murmurhash/MurmurHash3.cpp
> 
>   Tried extensions .c .C .c++ .cc .cpp .cxx .m .M .mm .h .hh .h++ .hm .hpp
>   .hxx .in .txx
> 
> 
> CMake Error: CMake can not determine linker language for target: libGLESv2

[Tomoki Imai]

Created attachment 328075 [details]
Modify CMakefile.txt and PlatformWin.cmake to fix WinCairo build after updating ANGLE

[Tomoki Imai]

I wonder why this part works on the other ports. These file even doesn't exist anymore.
> set(ANGLEGLESv2_SOURCES
>     src/libGLESv2/entry_points_egl.cpp
>     src/libGLESv2/entry_points_egl_ext.cpp
>     src/libGLESv2/entry_points_gles_2_0.cpp
>     src/libGLESv2/entry_points_gles_2_0_ext.cpp
>     src/libGLESv2/entry_points_gles_3_0.cpp
>     src/libGLESv2/entry_points_gles_3_1.cpp
>     src/libGLESv2/global_state.cpp
>     src/libGLESv2/libGLESv2.cpp
> )

[Tomoki Imai]

Comment on attachment 328075 [details]
Modify CMakefile.txt and PlatformWin.cmake to fix WinCairo build after updating ANGLE

>diff --git a/Source/ThirdParty/ANGLE/CMakeLists.txt b/Source/ThirdParty/ANGLE/CMakeLists.txt
>index 6b856692a82..b124a7d3281 100644
>--- a/Source/ThirdParty/ANGLE/CMakeLists.txt
>+++ b/Source/ThirdParty/ANGLE/CMakeLists.txt
>@@ -1,7 +1,7 @@
> include_directories(
>     .
>     src
>-    src/common/third_party/numerics
>+    src/common/third_party/base
>     include
>     include/KHR
> )
>@@ -24,10 +24,11 @@ set(ANGLEEGL_COMPILE_DEFINITIONS
> set(ANGLEGLESv2_SOURCES
>     src/libGLESv2/entry_points_egl.cpp
>     src/libGLESv2/entry_points_egl_ext.cpp
>-    src/libGLESv2/entry_points_gles_2_0.cpp
>+    src/libGLESv2/entry_points_gles_2_0_autogen.cpp
>     src/libGLESv2/entry_points_gles_2_0_ext.cpp
>-    src/libGLESv2/entry_points_gles_3_0.cpp
>-    src/libGLESv2/entry_points_gles_3_1.cpp
>+    src/libGLESv2/entry_points_gles_3_0_autogen.cpp
>+    src/libGLESv2/entry_points_gles_3_1_autogen.cpp
>+    src/libGLESv2/proc_table_autogen.cpp
>     src/libGLESv2/global_state.cpp
>     src/libGLESv2/libGLESv2.cpp
> )
>@@ -49,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
>diff --git a/Source/ThirdParty/ANGLE/ChangeLog b/Source/ThirdParty/ANGLE/ChangeLog
>index e620f0f70c8..9e095def780 100644
>--- a/Source/ThirdParty/ANGLE/ChangeLog
>+++ b/Source/ThirdParty/ANGLE/ChangeLog
>@@ -1,3 +1,13 @@
>[phone]  Tomoki Imai  <[e-mail]>
>+
>+        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-11-30  Ryan Haddad  <[e-mail]>
> 
>         Unreviewed build fix, remove executable property from a header file.
>diff --git a/Source/ThirdParty/ANGLE/PlatformWin.cmake b/Source/ThirdParty/ANGLE/PlatformWin.cmake
>index 9faea209f1b..3dcbf6fe303 100644
>--- a/Source/ThirdParty/ANGLE/PlatformWin.cmake
>+++ b/Source/ThirdParty/ANGLE/PlatformWin.cmake
>@@ -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,27 +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/third_party/murmurhash/MurmurHash3.cpp
>+    src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.cpp
>     src/third_party/systeminfo/SystemInfo.cpp
> )
>

[Tomoki Imai]

Created attachment 328077 [details]
patch

I change " Reviewed by NOBODY (OOPS!)." to "Unreviewed build fix."

[Tomoki Imai]

Created attachment 328079 [details]
Patch

I rebased the patch to fix current upstream.

[Don Olmstead]

This worked locally and I'm updating our buildbots and EWS to account for the changes in ANGLE. The buildbots were missing a DX SDK thats for Windows 10 that ANGLE is detecting.

Fingers crossed that buildbot is good after this.

[WebKit Commit Bot]

Comment on attachment 328079 [details]
Patch

Clearing flags on attachment: 328079

Committed r225405: <https://trac.webkit.org/changeset/225405>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Radar WebKit Bug Importer]

<rdar://problem/35802860>