Attachment 369406 Details for Bug 197676 – Patch without ANGLE roll

[patch] Patch without ANGLE roll

bug-197676-no-roll.diff (text/plain), 109.56 KB, created by Don Olmstead on 2019-05-08 12:19:43 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Don Olmstead

Created: 2019-05-08 12:19:43 PDT

Size: 109.56 KB

patch

obsolete

>diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
>index 54fe4a2d2bc..8bced685698 100644
>--- a/Source/CMakeLists.txt
>+++ b/Source/CMakeLists.txt
>@@ -13,7 +13,7 @@ endif ()
> 
> add_subdirectory(JavaScriptCore)
> 
>-if (WIN32 AND ENABLE_GRAPHICS_CONTEXT_3D)
>+if (ENABLE_GRAPHICS_CONTEXT_3D)
>     add_subdirectory(ThirdParty/ANGLE)
> endif ()
> 
>diff --git a/Source/ThirdParty/ANGLE/CMakeLists.txt b/Source/ThirdParty/ANGLE/CMakeLists.txt
>index 90de871668d..692ae541aec 100644
>--- a/Source/ThirdParty/ANGLE/CMakeLists.txt
>+++ b/Source/ThirdParty/ANGLE/CMakeLists.txt
>@@ -1,353 +1,158 @@
>-include_directories(
>-    .
>-    src
>-    src/common/third_party/base
>-    include
>-    include/KHR
>-)
>+# FIXME: Remove when landing https://bugs.webkit.org/show_bug.cgi?id=197174
>+function(WEBKIT_COPY_FILES target_name)
>+    set(options FLATTENED)
>+    set(oneValueArgs DESTINATION)
>+    set(multiValueArgs FILES)
>+    cmake_parse_arguments(opt "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
>+    set(files ${opt_FILES})
>+    set(dst_files)
>+    foreach (file IN LISTS files)
>+        if (IS_ABSOLUTE ${file})
>+            set(src_file ${file})
>+        else ()
>+            set(src_file ${CMAKE_CURRENT_SOURCE_DIR}/${file})
>+        endif ()
>+        if (opt_FLATTENED)
>+            get_filename_component(filename ${file} NAME)
>+            set(dst_file ${opt_DESTINATION}/${filename})
>+        else ()
>+            get_filename_component(file_dir ${file} DIRECTORY)
>+            file(MAKE_DIRECTORY ${opt_DESTINATION}/${file_dir})
>+            set(dst_file ${opt_DESTINATION}/${file})
>+        endif ()
>+        add_custom_command(OUTPUT ${dst_file}
>+            COMMAND ${CMAKE_COMMAND} -E copy ${src_file} ${dst_file}
>+            MAIN_DEPENDENCY ${file}
>+            VERBATIM
>+        )
>+        list(APPEND dst_files ${dst_file})
>+    endforeach ()
>+    add_custom_target(${target_name} DEPENDS ${dst_files})
>+endfunction()
>+
>+include(Compiler.cmake)
>+include(GLESv2.cmake)
> 
> if (WIN32)
>     # FIXME: DX11 support will not compile if this preprocessor definition is set
>     # DirectX Documentation is setting that version to 0x700 but there is no
>     # corresponding value in sdkddkver.h
>-    remove_definitions(-D_WIN32_WINNT=0x601)
>+    remove_definitions(-D_WIN32_WINNT=0x601 -DWINVER=0x601)
> endif ()
> 
>-set(ANGLEEGL_SOURCES
>-    src/libEGL/libEGL.cpp
>-)
>-
>-set(ANGLEEGL_COMPILE_DEFINITIONS
>-    EGLAPI=
>+set(no_gl_prototypes
>+    GL_GLES_PROTOTYPES=0
>+    EGL_EGL_PROTOTYPES=0
> )
> 
>-set(ANGLEGLESv2_SOURCES
>-    src/libGLESv2/entry_points_egl.cpp
>-    src/libGLESv2/entry_points_egl_ext.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_autogen.cpp
>-    src/libGLESv2/entry_points_gles_3_1_autogen.cpp
>-    src/libGLESv2/global_state.cpp
>-    src/libGLESv2/libGLESv2.cpp
>-    src/libGLESv2/proc_table_autogen.cpp
>+set(gl_prototypes
>+    GL_GLES_PROTOTYPES=1
>+    EGL_EGL_PROTOTYPES=1
>+    GL_GLEXT_PROTOTYPES
>+    EGL_EGLEXT_PROTOTYPES
> )
> 
>-set(ANGLEGLESv2_COMPILE_DEFINITIONS
>-    GL_APICALL=
>-    LIBGLESV2_IMPLEMENTATION
>+# ANGLE makes a number of small static libraries that are then joined into a
>+# bigger library that is built shared. Rather than making the small libraries
>+# there will be a ANGLE whose sources are dependent on whether the library
>+# is being used as a compiler or as a GLES implementation.
>+#
>+# The corresponding gn targets are described below
>+#
>+# ANGLE (Compiler only)
>+# + angle_common
>+# + preprocessor
>+# + translator
>+#
>+# ANGLE (GLES)
>+# + ANGLE (Compiler only)
>+# + xxhash
>+# + angle_image_util
>+# + angle_system_utils (OS specific)
>+# + angle_(renderer) (Backend and OS specific)
>+
>+set(ANGLE_PRIVATE_INCLUDE_DIRECTORIES
>+    "${CMAKE_CURRENT_SOURCE_DIR}/include"
>+    "${CMAKE_CURRENT_SOURCE_DIR}/src"
>+    "${CMAKE_CURRENT_SOURCE_DIR}/src/common/third_party/base"
> )
> 
>-set(ANGLEGLESv2_LIBRARIES
>-    libANGLE
>+set(ANGLE_DEFINITIONS
>+    ANGLE_ENABLE_ESSL
> )
> 
> set(ANGLE_SOURCES
>-    src/common/angleutils.cpp
>-    src/common/debug.cpp
>-    src/common/event_tracer.cpp
>-    src/common/Float16ToFloat32.cpp
>-    src/common/mathutil.cpp
>-    src/common/MemoryBuffer.cpp
>-    src/common/string_utils.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
>-    src/compiler/preprocessor/DiagnosticsBase.cpp
>-    src/compiler/preprocessor/DirectiveHandlerBase.cpp
>-    src/compiler/preprocessor/DirectiveParser.cpp
>-    src/compiler/preprocessor/ExpressionParser.cpp
>-    src/compiler/preprocessor/Input.cpp
>-    src/compiler/preprocessor/Lexer.cpp
>-    src/compiler/preprocessor/Macro.cpp
>-    src/compiler/preprocessor/MacroExpander.cpp
>-    src/compiler/preprocessor/Preprocessor.cpp
>-    src/compiler/preprocessor/Token.cpp
>-    src/compiler/preprocessor/Tokenizer.cpp
>-    src/compiler/translator/ASTMetadataHLSL.cpp
>-    src/compiler/translator/AddAndTrueToLoopCondition.cpp
>-    src/compiler/translator/AddDefaultReturnStatements.cpp
>-    src/compiler/translator/ArrayReturnValueToOutParameter.cpp
>-    src/compiler/translator/BreakVariableAliasingInInnerLoops.cpp
>-    src/compiler/translator/BuiltInFunctionEmulator.cpp
>-    src/compiler/translator/BuiltInFunctionEmulatorGLSL.cpp
>-    src/compiler/translator/BuiltInFunctionEmulatorHLSL.cpp
>-    src/compiler/translator/Cache.cpp
>-    src/compiler/translator/CallDAG.cpp
>-    src/compiler/translator/ClampPointSize.cpp
>-    src/compiler/translator/CodeGen.cpp
>-    src/compiler/translator/CollectVariables.cpp
>-    src/compiler/translator/Compiler.cpp
>-    src/compiler/translator/ConstantUnion.cpp
>-    src/compiler/translator/DeclareAndInitBuiltinsForInstancedMultiview.cpp
>-    src/compiler/translator/DeferGlobalInitializers.cpp
>-    src/compiler/translator/Diagnostics.cpp
>-    src/compiler/translator/DirectiveHandler.cpp
>-    src/compiler/translator/EmulateGLFragColorBroadcast.cpp
>-    src/compiler/translator/EmulatePrecision.cpp
>-    src/compiler/translator/ExpandIntegerPowExpressions.cpp
>-    src/compiler/translator/ExtensionBehavior.cpp
>-    src/compiler/translator/ExtensionGLSL.cpp
>-    src/compiler/translator/FindMain.cpp
>-    src/compiler/translator/FindSymbolNode.cpp
>-    src/compiler/translator/FlagStd140Structs.cpp
>-    src/compiler/translator/HashNames.cpp
>-    src/compiler/translator/ImageFunctionHLSL.cpp
>-    src/compiler/translator/InfoSink.cpp
>-    src/compiler/translator/Initialize.cpp
>-    src/compiler/translator/InitializeDll.cpp
>-    src/compiler/translator/InitializeVariables.cpp
>-    src/compiler/translator/IntermNode.cpp
>-    src/compiler/translator/IntermNodePatternMatcher.cpp
>-    src/compiler/translator/IntermNode_util.cpp
>-    src/compiler/translator/IntermTraverse.cpp
>-    src/compiler/translator/IsASTDepthBelowLimit.cpp
>-    src/compiler/translator/Operator.cpp
>-    src/compiler/translator/OutputESSL.cpp
>-    src/compiler/translator/OutputGLSL.cpp
>-    src/compiler/translator/OutputGLSLBase.cpp
>-    src/compiler/translator/OutputHLSL.cpp
>-    src/compiler/translator/OutputTree.cpp
>-    src/compiler/translator/OutputVulkanGLSL.cpp
>-    src/compiler/translator/ParseContext.cpp
>-    src/compiler/translator/PoolAlloc.cpp
>-    src/compiler/translator/PruneNoOps.cpp
>-    src/compiler/translator/QualifierTypes.cpp
>-    src/compiler/translator/RecordConstantPrecision.cpp
>-    src/compiler/translator/RegenerateStructNames.cpp
>-    src/compiler/translator/RemoveArrayLengthMethod.cpp
>-    src/compiler/translator/RemoveDynamicIndexing.cpp
>-    src/compiler/translator/RemoveEmptySwitchStatements.cpp
>-    src/compiler/translator/RemoveInvariantDeclaration.cpp
>-    src/compiler/translator/RemoveNoOpCasesFromEndOfSwitchStatements.cpp
>-    src/compiler/translator/RemovePow.cpp
>-    src/compiler/translator/RemoveSwitchFallThrough.cpp
>-    src/compiler/translator/RemoveUnreferencedVariables.cpp
>-    src/compiler/translator/RewriteDoWhile.cpp
>-    src/compiler/translator/RewriteElseBlocks.cpp
>-    src/compiler/translator/RewriteTexelFetchOffset.cpp
>-    src/compiler/translator/RewriteUnaryMinusOperatorFloat.cpp
>-    src/compiler/translator/RewriteUnaryMinusOperatorInt.cpp
>-    src/compiler/translator/RunAtTheEndOfShader.cpp
>-    src/compiler/translator/ScalarizeVecAndMatConstructorArgs.cpp
>-    src/compiler/translator/SearchSymbol.cpp
>-    src/compiler/translator/SeparateArrayInitialization.cpp
>-    src/compiler/translator/SeparateDeclarations.cpp
>-    src/compiler/translator/SeparateExpressionsReturningArrays.cpp
>-    src/compiler/translator/ShaderLang.cpp
>-    src/compiler/translator/ShaderVars.cpp
>-    src/compiler/translator/SimplifyLoopConditions.cpp
>-    src/compiler/translator/SplitSequenceOperator.cpp
>-    src/compiler/translator/StructureHLSL.cpp
>-    src/compiler/translator/SymbolTable.cpp
>-    src/compiler/translator/SymbolUniqueId.cpp
>-    src/compiler/translator/TextureFunctionHLSL.cpp
>-    src/compiler/translator/TranslatorESSL.cpp
>-    src/compiler/translator/TranslatorGLSL.cpp
>-    src/compiler/translator/TranslatorHLSL.cpp
>-    src/compiler/translator/TranslatorVulkan.cpp
>-    src/compiler/translator/Types.cpp
>-    src/compiler/translator/UnfoldShortCircuitAST.cpp
>-    src/compiler/translator/UnfoldShortCircuitToIf.cpp
>-    src/compiler/translator/UniformHLSL.cpp
>-    src/compiler/translator/UseInterfaceBlockFields.cpp
>-    src/compiler/translator/UtilsHLSL.cpp
>-    src/compiler/translator/ValidateGlobalInitializer.cpp
>-    src/compiler/translator/ValidateLimitations.cpp
>-    src/compiler/translator/ValidateMaxParameters.cpp
>-    src/compiler/translator/ValidateOutputs.cpp
>-    src/compiler/translator/ValidateSwitch.cpp
>-    src/compiler/translator/ValidateVaryingLocations.cpp
>-    src/compiler/translator/VariablePacker.cpp
>-    src/compiler/translator/VectorizeVectorScalarArithmetic.cpp
>-    src/compiler/translator/VersionGLSL.cpp
>-    src/compiler/translator/WrapSwitchStatementsInBlocks.cpp
>-    src/compiler/translator/blocklayout.cpp
>-    src/compiler/translator/blocklayoutHLSL.cpp
>-    src/compiler/translator/emulated_builtin_functions_hlsl_autogen.cpp
>-    src/compiler/translator/glslang_lex.cpp
>-    src/compiler/translator/glslang_tab.cpp
>-    src/compiler/translator/util.cpp
>-    src/image_util/copyimage.cpp
>-    src/image_util/imageformats.cpp
>-    src/image_util/loadimage.cpp
>-    src/image_util/loadimage_etc.cpp
>-    src/libANGLE/AttributeMap.cpp
>-    src/libANGLE/Buffer.cpp
>-    src/libANGLE/Caps.cpp
>-    src/libANGLE/Compiler.cpp
>-    src/libANGLE/Config.cpp
>-    src/libANGLE/Context.cpp
>-    src/libANGLE/ContextState.cpp
>-    src/libANGLE/Debug.cpp
>-    src/libANGLE/Device.cpp
>-    src/libANGLE/Display.cpp
>-    src/libANGLE/Error.cpp
>-    src/libANGLE/Fence.cpp
>-    src/libANGLE/Framebuffer.cpp
>-    src/libANGLE/FramebufferAttachment.cpp
>-    src/libANGLE/HandleAllocator.cpp
>-    src/libANGLE/HandleRangeAllocator.cpp
>-    src/libANGLE/Image.cpp
>-    src/libANGLE/ImageIndex.cpp
>-    src/libANGLE/IndexRangeCache.cpp
>-    src/libANGLE/LoggingAnnotator.cpp
>-    src/libANGLE/MemoryProgramCache.cpp
>-    src/libANGLE/PackedGLEnums_autogen.cpp
>-    src/libANGLE/Path.cpp
>-    src/libANGLE/Platform.cpp
>-    src/libANGLE/Program.cpp
>-    src/libANGLE/ProgramLinkedResources.cpp
>-    src/libANGLE/ProgramPipeline.cpp
>-    src/libANGLE/Query.cpp
>-    src/libANGLE/Renderbuffer.cpp
>-    src/libANGLE/ResourceManager.cpp
>-    src/libANGLE/Sampler.cpp
>-    src/libANGLE/Shader.cpp
>-    src/libANGLE/State.cpp
>-    src/libANGLE/Stream.cpp
>-    src/libANGLE/Surface.cpp
>-    src/libANGLE/Texture.cpp
>-    src/libANGLE/Thread.cpp
>-    src/libANGLE/TransformFeedback.cpp
>-    src/libANGLE/Uniform.cpp
>-    src/libANGLE/VaryingPacking.cpp
>-    src/libANGLE/VertexArray.cpp
>-    src/libANGLE/VertexAttribute.cpp
>-    src/libANGLE/WorkerThread.cpp
>-    src/libANGLE/angletypes.cpp
>-    src/libANGLE/es3_copy_conversion_table_autogen.cpp
>-    src/libANGLE/format_map_autogen.cpp
>-    src/libANGLE/formatutils.cpp
>-    src/libANGLE/params.cpp
>-    src/libANGLE/queryconversions.cpp
>-    src/libANGLE/queryutils.cpp
>-    src/libANGLE/renderer/ContextImpl.cpp
>-    src/libANGLE/renderer/DeviceImpl.cpp
>-    src/libANGLE/renderer/DisplayImpl.cpp
>-    src/libANGLE/renderer/Format_table_autogen.cpp
>-    src/libANGLE/renderer/SurfaceImpl.cpp
>-    src/libANGLE/renderer/TextureImpl.cpp
>-    src/libANGLE/renderer/driver_utils.cpp
>-    src/libANGLE/renderer/load_functions_table_autogen.cpp
>-    src/libANGLE/renderer/renderer_utils.cpp
>-    src/libANGLE/validationEGL.cpp
>-    src/libANGLE/validationES.cpp
>-    src/libANGLE/validationES2.cpp
>-    src/libANGLE/validationES3.cpp
>-    src/libANGLE/validationES31.cpp
>-    src/third_party/compiler/ArrayBoundsClamper.cpp
>+    ${libangle_common_sources}
>+    ${angle_preprocessor_sources}
>+    ${angle_translator_essl_sources}
>+    ${angle_translator_glsl_sources}
>+    ${angle_translator_sources}
> )
> 
>-set(ANGLE_COMPILE_DEFINITIONS
>-    ANGLE_ENABLE_ESSL
>-    ANGLE_ENABLE_GLSL
>-    LIBANGLE_IMPLEMENTATION
>-    NOMINMAX
>+set(ANGLEGLESv2_LIBRARIES
>+    ANGLE
> )
> 
>-if (NOT WIN32)
>-    list(APPEND ANGLE_SOURCES
>-        src/libANGLE/renderer/gl/BlitGL.cpp
>-        src/libANGLE/renderer/gl/BufferGL.cpp
>-        src/libANGLE/renderer/gl/ClearMultiviewGL.cpp
>-        src/libANGLE/renderer/gl/CompilerGL.cpp
>-        src/libANGLE/renderer/gl/ContextGL.cpp
>-        src/libANGLE/renderer/gl/DispatchTableGL_autogen.cpp
>-        src/libANGLE/renderer/gl/DisplayGL.cpp
>-        src/libANGLE/renderer/gl/FenceNVGL.cpp
>-        src/libANGLE/renderer/gl/FramebufferGL.cpp
>-        src/libANGLE/renderer/gl/FunctionsGL.cpp
>-        src/libANGLE/renderer/gl/PathGL.cpp
>-        src/libANGLE/renderer/gl/ProgramGL.cpp
>-        src/libANGLE/renderer/gl/ProgramPipelineGL.cpp
>-        src/libANGLE/renderer/gl/QueryGL.cpp
>-        src/libANGLE/renderer/gl/RenderbufferGL.cpp
>-        src/libANGLE/renderer/gl/RendererGL.cpp
>-        src/libANGLE/renderer/gl/SamplerGL.cpp
>-        src/libANGLE/renderer/gl/ShaderGL.cpp
>-        src/libANGLE/renderer/gl/StateManagerGL.cpp
>-        src/libANGLE/renderer/gl/SurfaceGL.cpp
>-        src/libANGLE/renderer/gl/SyncGL.cpp
>-        src/libANGLE/renderer/gl/TextureGL.cpp
>-        src/libANGLE/renderer/gl/TransformFeedbackGL.cpp
>-        src/libANGLE/renderer/gl/VertexArrayGL.cpp
>-        src/libANGLE/renderer/gl/egl/DisplayEGL.cpp
>-        src/libANGLE/renderer/gl/egl/FunctionsEGL.cpp
>-        src/libANGLE/renderer/gl/egl/FunctionsEGLDL.cpp
>-        src/libANGLE/renderer/gl/egl/PbufferSurfaceEGL.cpp
>-        src/libANGLE/renderer/gl/egl/SurfaceEGL.cpp
>-        src/libANGLE/renderer/gl/egl/WindowSurfaceEGL.cpp
>-        src/libANGLE/renderer/gl/egl/android/DisplayAndroid.cpp
>-        src/libANGLE/renderer/gl/egl/egl_utils.cpp
>-        src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.cpp
>-        src/libANGLE/renderer/gl/egl/ozone/SurfaceOzone.cpp
>-        src/libANGLE/renderer/gl/formatutilsgl.cpp
>-        src/libANGLE/renderer/gl/glx/DisplayGLX.cpp
>-        src/libANGLE/renderer/gl/glx/FunctionsGLX.cpp
>-        src/libANGLE/renderer/gl/glx/PbufferSurfaceGLX.cpp
>-        src/libANGLE/renderer/gl/glx/WindowSurfaceGLX.cpp
>-        src/libANGLE/renderer/gl/null_functions.cpp
>-        src/libANGLE/renderer/gl/renderergl_utils.cpp
>-        src/libANGLE/renderer/gl/wgl/D3DTextureSurfaceWGL.cpp
>-        src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.cpp
>-        src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp
>-        src/libANGLE/renderer/gl/wgl/FunctionsWGL.cpp
>-        src/libANGLE/renderer/gl/wgl/PbufferSurfaceWGL.cpp
>-        src/libANGLE/renderer/gl/wgl/WindowSurfaceWGL.cpp
>-        src/libANGLE/renderer/gl/wgl/wgl_utils.cpp
>-    )
>-    list(APPEND ANGLE_COMPILE_DEFINITIONS
>-        ANGLE_ENABLE_OPENGL
>-    )
>-endif ()
>-
> WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
> 
>-add_library(libEGL SHARED ${ANGLEEGL_SOURCES})
>-set_property(TARGET libEGL PROPERTY COMPILE_DEFINITIONS ${ANGLEEGL_COMPILE_DEFINITIONS})
>-
>-add_library(libGLESv2 SHARED ${ANGLEGLESv2_SOURCES})
>-set_property(TARGET libGLESv2 PROPERTY COMPILE_DEFINITIONS ${ANGLEGLESv2_COMPILE_DEFINITIONS})
>+add_subdirectory(include)
> 
>-add_library(libANGLE STATIC ${ANGLE_SOURCES})
>-set_property(TARGET libANGLE PROPERTY COMPILE_DEFINITIONS ${ANGLE_COMPILE_DEFINITIONS})
>+add_library(ANGLEFramework INTERFACE)
>+add_dependencies(ANGLEFramework GLSLANGHeaders ANGLEHeaders)
> 
>-target_link_libraries(libEGL
>-    libGLESv2
>-)
>+if (USE_ANGLE_EGL)
>+    add_library(ANGLE STATIC
>+        ${ANGLE_SOURCES}
>+        ${libangle_sources}
>+        ${libangle_image_util_sources}
>+        ${xxhash_sources}
>+    )
>+    target_include_directories(ANGLE PRIVATE ${ANGLE_PRIVATE_INCLUDE_DIRECTORIES})
>+    target_compile_definitions(ANGLE PRIVATE
>+        ${no_gl_prototypes}
>+        LIBANGLE_IMPLEMENTATION
>+    )
>+    target_compile_definitions(ANGLE PUBLIC ${ANGLE_DEFINITIONS})
>+
>+    add_library(GLESv2 SHARED ${libglesv2_sources})
>+    target_include_directories(GLESv2 PRIVATE ${ANGLE_PRIVATE_INCLUDE_DIRECTORIES})
>+    target_compile_definitions(GLESv2 PRIVATE LIBGLESV2_IMPLEMENTATION)
>+    target_link_libraries(GLESv2 ${ANGLEGLESv2_LIBRARIES})
>+
>+    add_library(EGL SHARED ${libegl_sources})
>+    target_include_directories(EGL PRIVATE ${ANGLE_PRIVATE_INCLUDE_DIRECTORIES})
>+    target_compile_definitions(EGL PRIVATE
>+        ${gl_prototypes}
>+        EGLAPI=
>+    )
>+    target_link_libraries(EGL GLESv2)
>+
>+    if (WIN32)
>+        target_sources(GLESv2 PRIVATE src/libGLESv2/libGLESv2_autogen.def)
>+        target_sources(EGL PRIVATE src/libEGL/libEGL.def)
>+
>+        # Output library names according to the .def
>+        set_target_properties(GLESv2 PROPERTIES OUTPUT_NAME libGLESv2)
>+        set_target_properties(EGL PROPERTIES OUTPUT_NAME libEGL)
>+    endif ()
>+
>+    target_link_libraries(ANGLEFramework INTERFACE EGL GLESv2)
>+    target_compile_definitions(ANGLEFramework INTERFACE ${gl_prototypes})
>+else ()
>+    add_library(ANGLE STATIC ${ANGLE_SOURCES})
>+    target_include_directories(ANGLE PRIVATE ${ANGLE_PRIVATE_INCLUDE_DIRECTORIES})
>+    target_compile_definitions(ANGLE PRIVATE
>+        ${ANGLE_DEFINITIONS}
>+        ${no_gl_prototypes}
>+        LIBANGLE_IMPLEMENTATION
>+    )
>+endif ()
> 
>-target_link_libraries(libGLESv2 ${ANGLEGLESv2_LIBRARIES})
>+if (COMPILER_IS_GCC_OR_CLANG)
>+    WEBKIT_ADD_TARGET_CXX_FLAGS(ANGLE -Wno-cast-align -Wno-unused-parameter)
>+endif ()
> 
>-file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/ANGLE/include/egl)
>-file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/ANGLE/include/GLES2)
>-file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/ANGLE/include/GLSLANG)
>-file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/ANGLE/include/khr)
>-file(GLOB _files_ANGLE "${THIRDPARTY_DIR}/ANGLE/ANGLE/*.h")
>-file(GLOB _files_egl "${THIRDPARTY_DIR}/ANGLE/include/egl/*.h")
>-file(GLOB _files_GLES2 "${THIRDPARTY_DIR}/ANGLE/include/GLES2/*.h")
>-file(GLOB _files_GLES3 "${THIRDPARTY_DIR}/ANGLE/include/GLES3/*.h")
>-file(GLOB _files_GLSLANG "${THIRDPARTY_DIR}/ANGLE/include/GLSLANG/*.h")
>-file(GLOB _files_khr "${THIRDPARTY_DIR}/ANGLE/include/khr/*.h")
>-foreach (_file ${_files_ANGLE})
>-    file(COPY ${_file} DESTINATION ${FORWARDING_HEADERS_DIR}/ANGLE/)
>-endforeach ()
>-foreach (_file ${_files_egl})
>-    file(COPY ${_file} DESTINATION ${FORWARDING_HEADERS_DIR}/ANGLE/include/egl)
>-endforeach ()
>-foreach (_file ${_files_GLES2})
>-    file(COPY ${_file} DESTINATION ${FORWARDING_HEADERS_DIR}/ANGLE/include/GLES2)
>-endforeach ()
>-foreach (_file ${_files_GLES3})
>-    file(COPY ${_file} DESTINATION ${FORWARDING_HEADERS_DIR}/ANGLE/include/GLES3)
>-endforeach ()
>-foreach (_file ${_files_GLSLANG})
>-    file(COPY ${_file} DESTINATION ${FORWARDING_HEADERS_DIR}/ANGLE/include/GLSLANG)
>-endforeach ()
>-foreach (_file ${_files_khr})
>-    file(COPY ${_file} DESTINATION ${FORWARDING_HEADERS_DIR}/ANGLE/include/khr)
>-endforeach ()
>+target_link_libraries(ANGLEFramework INTERFACE ANGLE)
>+target_include_directories(ANGLEFramework INTERFACE ${ANGLE_FRAMEWORK_HEADERS_DIR})
> 
> set_property(DIRECTORY . PROPERTY FOLDER "ANGLE")
>diff --git a/Source/ThirdParty/ANGLE/Compiler.cmake b/Source/ThirdParty/ANGLE/Compiler.cmake
>new file mode 100644
>index 00000000000..c3d8f61f44c
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/Compiler.cmake
>@@ -0,0 +1,301 @@
>+# Contains the source file definitions in src/compiler.gn
>+#
>+# This is a direct mapping of ALL values unless otherwise specified. All
>+# declarations are in the same ordering as the original .gn file
>+
>+set(angle_translator_sources
>+    src/compiler/translator/BaseTypes.h
>+    src/compiler/translator/BuiltInFunctionEmulator.cpp
>+    src/compiler/translator/BuiltInFunctionEmulator.h
>+    src/compiler/translator/CallDAG.cpp
>+    src/compiler/translator/CallDAG.h
>+    src/compiler/translator/CodeGen.cpp
>+    src/compiler/translator/CollectVariables.cpp
>+    src/compiler/translator/CollectVariables.h
>+    src/compiler/translator/Common.h
>+    src/compiler/translator/Compiler.cpp
>+    src/compiler/translator/Compiler.h
>+    src/compiler/translator/ConstantUnion.cpp
>+    src/compiler/translator/ConstantUnion.h
>+    src/compiler/translator/Declarator.cpp
>+    src/compiler/translator/Declarator.h
>+    src/compiler/translator/Diagnostics.cpp
>+    src/compiler/translator/Diagnostics.h
>+    src/compiler/translator/DirectiveHandler.cpp
>+    src/compiler/translator/DirectiveHandler.h
>+    src/compiler/translator/ExtensionBehavior.cpp
>+    src/compiler/translator/ExtensionBehavior.h
>+    src/compiler/translator/FlagStd140Structs.cpp
>+    src/compiler/translator/FlagStd140Structs.h
>+    src/compiler/translator/FunctionLookup.cpp
>+    src/compiler/translator/FunctionLookup.h
>+    src/compiler/translator/HashNames.cpp
>+    src/compiler/translator/HashNames.h
>+    src/compiler/translator/ImmutableString.cpp
>+    src/compiler/translator/ImmutableString.h
>+    src/compiler/translator/ImmutableStringBuilder.cpp
>+    src/compiler/translator/ImmutableStringBuilder.h
>+    src/compiler/translator/InfoSink.cpp
>+    src/compiler/translator/InfoSink.h
>+    src/compiler/translator/Initialize.cpp
>+    src/compiler/translator/Initialize.h
>+    src/compiler/translator/InitializeDll.cpp
>+    src/compiler/translator/InitializeDll.h
>+    src/compiler/translator/InitializeGlobals.h
>+    src/compiler/translator/IntermNode.h
>+    src/compiler/translator/IntermNode.cpp
>+    src/compiler/translator/IsASTDepthBelowLimit.cpp
>+    src/compiler/translator/IsASTDepthBelowLimit.h
>+    src/compiler/translator/Operator.cpp
>+    src/compiler/translator/Operator.h
>+    src/compiler/translator/OutputTree.cpp
>+    src/compiler/translator/OutputTree.h
>+    src/compiler/translator/ParseContext.cpp
>+    src/compiler/translator/ParseContext.h
>+    src/compiler/translator/ParseContext_autogen.h
>+    src/compiler/translator/PoolAlloc.cpp
>+    src/compiler/translator/PoolAlloc.h
>+    src/compiler/translator/Pragma.h
>+    src/compiler/translator/QualifierTypes.h
>+    src/compiler/translator/QualifierTypes.cpp
>+    src/compiler/translator/Severity.h
>+    src/compiler/translator/ShaderLang.cpp
>+    src/compiler/translator/ShaderVars.cpp
>+    src/compiler/translator/StaticType.h
>+    src/compiler/translator/Symbol.cpp
>+    src/compiler/translator/Symbol.h
>+    src/compiler/translator/SymbolTable.cpp
>+    src/compiler/translator/SymbolTable.h
>+    src/compiler/translator/SymbolTable_autogen.cpp
>+    src/compiler/translator/SymbolTable_autogen.h
>+    src/compiler/translator/SymbolUniqueId.cpp
>+    src/compiler/translator/SymbolUniqueId.h
>+    src/compiler/translator/Types.cpp
>+    src/compiler/translator/Types.h
>+    src/compiler/translator/ValidateAST.cpp
>+    src/compiler/translator/ValidateAST.h
>+    src/compiler/translator/ValidateGlobalInitializer.cpp
>+    src/compiler/translator/ValidateGlobalInitializer.h
>+    src/compiler/translator/ValidateLimitations.cpp
>+    src/compiler/translator/ValidateLimitations.h
>+    src/compiler/translator/ValidateMaxParameters.h
>+    src/compiler/translator/ValidateMaxParameters.cpp
>+    src/compiler/translator/ValidateOutputs.cpp
>+    src/compiler/translator/ValidateOutputs.h
>+    src/compiler/translator/ValidateSwitch.cpp
>+    src/compiler/translator/ValidateSwitch.h
>+    src/compiler/translator/ValidateVaryingLocations.cpp
>+    src/compiler/translator/ValidateVaryingLocations.h
>+    src/compiler/translator/VariablePacker.cpp
>+    src/compiler/translator/VariablePacker.h
>+    src/compiler/translator/blocklayout.cpp
>+    src/compiler/translator/blocklayout.h
>+    src/compiler/translator/glslang.h
>+    src/compiler/translator/glslang.l
>+    src/compiler/translator/glslang.y
>+    src/compiler/translator/glslang_lex.cpp
>+    src/compiler/translator/glslang_tab.cpp
>+    src/compiler/translator/glslang_tab.h
>+    src/compiler/translator/length_limits.h
>+    src/compiler/translator/util.cpp
>+    src/compiler/translator/util.h
>+    src/compiler/translator/tree_ops/AddAndTrueToLoopCondition.cpp
>+    src/compiler/translator/tree_ops/AddAndTrueToLoopCondition.h
>+    src/compiler/translator/tree_ops/BreakVariableAliasingInInnerLoops.cpp
>+    src/compiler/translator/tree_ops/BreakVariableAliasingInInnerLoops.h
>+    src/compiler/translator/tree_ops/ClampFragDepth.cpp
>+    src/compiler/translator/tree_ops/ClampFragDepth.h
>+    src/compiler/translator/tree_ops/ClampPointSize.cpp
>+    src/compiler/translator/tree_ops/ClampPointSize.h
>+    src/compiler/translator/tree_ops/DeclareAndInitBuiltinsForInstancedMultiview.h
>+    src/compiler/translator/tree_ops/DeclareAndInitBuiltinsForInstancedMultiview.cpp
>+    src/compiler/translator/tree_ops/DeferGlobalInitializers.cpp
>+    src/compiler/translator/tree_ops/DeferGlobalInitializers.h
>+    src/compiler/translator/tree_ops/EmulateGLDrawID.cpp
>+    src/compiler/translator/tree_ops/EmulateGLDrawID.h
>+    src/compiler/translator/tree_ops/EmulateGLFragColorBroadcast.cpp
>+    src/compiler/translator/tree_ops/EmulateGLFragColorBroadcast.h
>+    src/compiler/translator/tree_ops/EmulatePrecision.cpp
>+    src/compiler/translator/tree_ops/EmulatePrecision.h
>+    src/compiler/translator/tree_ops/ExpandIntegerPowExpressions.cpp
>+    src/compiler/translator/tree_ops/ExpandIntegerPowExpressions.h
>+    src/compiler/translator/tree_ops/FoldExpressions.cpp
>+    src/compiler/translator/tree_ops/FoldExpressions.h
>+    src/compiler/translator/tree_ops/InitializeVariables.cpp
>+    src/compiler/translator/tree_ops/InitializeVariables.h
>+    src/compiler/translator/tree_ops/NameEmbeddedUniformStructs.cpp
>+    src/compiler/translator/tree_ops/NameEmbeddedUniformStructs.h
>+    src/compiler/translator/tree_ops/PruneEmptyCases.cpp
>+    src/compiler/translator/tree_ops/PruneEmptyCases.h
>+    src/compiler/translator/tree_ops/PruneNoOps.cpp
>+    src/compiler/translator/tree_ops/PruneNoOps.h
>+    src/compiler/translator/tree_ops/RecordConstantPrecision.cpp
>+    src/compiler/translator/tree_ops/RecordConstantPrecision.h
>+    src/compiler/translator/tree_ops/RegenerateStructNames.cpp
>+    src/compiler/translator/tree_ops/RegenerateStructNames.h
>+    src/compiler/translator/tree_ops/RemoveArrayLengthMethod.cpp
>+    src/compiler/translator/tree_ops/RemoveArrayLengthMethod.h
>+    src/compiler/translator/tree_ops/RemoveInvariantDeclaration.cpp
>+    src/compiler/translator/tree_ops/RemoveInvariantDeclaration.h
>+    src/compiler/translator/tree_ops/RemovePow.cpp
>+    src/compiler/translator/tree_ops/RemovePow.h
>+    src/compiler/translator/tree_ops/RemoveUnreferencedVariables.cpp
>+    src/compiler/translator/tree_ops/RemoveUnreferencedVariables.h
>+    src/compiler/translator/tree_ops/RewriteAtomicFunctionExpressions.cpp
>+    src/compiler/translator/tree_ops/RewriteAtomicFunctionExpressions.h
>+    src/compiler/translator/tree_ops/RewriteDoWhile.cpp
>+    src/compiler/translator/tree_ops/RewriteDoWhile.h
>+    src/compiler/translator/tree_ops/RewriteExpressionsWithShaderStorageBlock.cpp
>+    src/compiler/translator/tree_ops/RewriteExpressionsWithShaderStorageBlock.h
>+    src/compiler/translator/tree_ops/RewriteStructSamplers.cpp
>+    src/compiler/translator/tree_ops/RewriteStructSamplers.h
>+    src/compiler/translator/tree_ops/RewriteRepeatedAssignToSwizzled.cpp
>+    src/compiler/translator/tree_ops/RewriteRepeatedAssignToSwizzled.h
>+    src/compiler/translator/tree_ops/RewriteTexelFetchOffset.cpp
>+    src/compiler/translator/tree_ops/RewriteTexelFetchOffset.h
>+    src/compiler/translator/tree_ops/RewriteUnaryMinusOperatorFloat.cpp
>+    src/compiler/translator/tree_ops/RewriteUnaryMinusOperatorFloat.h
>+    src/compiler/translator/tree_ops/RewriteUnaryMinusOperatorInt.cpp
>+    src/compiler/translator/tree_ops/RewriteUnaryMinusOperatorInt.h
>+    src/compiler/translator/tree_ops/ScalarizeVecAndMatConstructorArgs.cpp
>+    src/compiler/translator/tree_ops/ScalarizeVecAndMatConstructorArgs.h
>+    src/compiler/translator/tree_ops/SeparateDeclarations.cpp
>+    src/compiler/translator/tree_ops/SeparateDeclarations.h
>+    src/compiler/translator/tree_ops/SimplifyLoopConditions.cpp
>+    src/compiler/translator/tree_ops/SimplifyLoopConditions.h
>+    src/compiler/translator/tree_ops/SplitSequenceOperator.cpp
>+    src/compiler/translator/tree_ops/SplitSequenceOperator.h
>+    src/compiler/translator/tree_ops/UnfoldShortCircuitAST.cpp
>+    src/compiler/translator/tree_ops/UnfoldShortCircuitAST.h
>+    src/compiler/translator/tree_ops/UseInterfaceBlockFields.cpp
>+    src/compiler/translator/tree_ops/UseInterfaceBlockFields.h
>+    src/compiler/translator/tree_ops/VectorizeVectorScalarArithmetic.cpp
>+    src/compiler/translator/tree_ops/VectorizeVectorScalarArithmetic.h
>+    src/compiler/translator/tree_util/BuiltIn_autogen.h
>+    src/compiler/translator/tree_util/FindMain.cpp
>+    src/compiler/translator/tree_util/FindMain.h
>+    src/compiler/translator/tree_util/FindSymbolNode.cpp
>+    src/compiler/translator/tree_util/FindSymbolNode.h
>+    src/compiler/translator/tree_util/IntermNodePatternMatcher.cpp
>+    src/compiler/translator/tree_util/IntermNodePatternMatcher.h
>+    src/compiler/translator/tree_util/IntermNode_util.cpp
>+    src/compiler/translator/tree_util/IntermNode_util.h
>+    src/compiler/translator/tree_util/IntermTraverse.cpp
>+    src/compiler/translator/tree_util/IntermTraverse.h
>+    src/compiler/translator/tree_util/NodeSearch.h
>+    src/compiler/translator/tree_util/ReplaceVariable.cpp
>+    src/compiler/translator/tree_util/ReplaceVariable.h
>+    src/compiler/translator/tree_util/RunAtTheEndOfShader.cpp
>+    src/compiler/translator/tree_util/RunAtTheEndOfShader.h
>+    src/compiler/translator/tree_util/Visit.h
>+    src/third_party/compiler/ArrayBoundsClamper.cpp
>+    src/third_party/compiler/ArrayBoundsClamper.h
>+)
>+
>+set(angle_translator_essl_sources
>+    src/compiler/translator/OutputESSL.cpp
>+    src/compiler/translator/OutputESSL.h
>+    src/compiler/translator/TranslatorESSL.cpp
>+    src/compiler/translator/TranslatorESSL.h
>+)
>+
>+set(angle_translator_glsl_sources
>+    src/compiler/translator/BuiltInFunctionEmulatorGLSL.cpp
>+    src/compiler/translator/BuiltInFunctionEmulatorGLSL.h
>+    src/compiler/translator/ExtensionGLSL.cpp
>+    src/compiler/translator/ExtensionGLSL.h
>+    src/compiler/translator/OutputGLSL.cpp
>+    src/compiler/translator/OutputGLSL.h
>+    src/compiler/translator/OutputGLSLBase.cpp
>+    src/compiler/translator/OutputGLSLBase.h
>+    src/compiler/translator/TranslatorGLSL.cpp
>+    src/compiler/translator/TranslatorGLSL.h
>+    src/compiler/translator/VersionGLSL.cpp
>+    src/compiler/translator/VersionGLSL.h
>+)
>+
>+set(angle_translator_hlsl_sources
>+    src/compiler/translator/ASTMetadataHLSL.cpp
>+    src/compiler/translator/ASTMetadataHLSL.h
>+    src/compiler/translator/AtomicCounterFunctionHLSL.cpp
>+    src/compiler/translator/AtomicCounterFunctionHLSL.h
>+    src/compiler/translator/blocklayoutHLSL.cpp
>+    src/compiler/translator/blocklayoutHLSL.h
>+    src/compiler/translator/BuiltInFunctionEmulatorHLSL.cpp
>+    src/compiler/translator/BuiltInFunctionEmulatorHLSL.h
>+    src/compiler/translator/OutputHLSL.cpp
>+    src/compiler/translator/OutputHLSL.h
>+    src/compiler/translator/ResourcesHLSL.cpp
>+    src/compiler/translator/ResourcesHLSL.h
>+    src/compiler/translator/ShaderStorageBlockFunctionHLSL.cpp
>+    src/compiler/translator/ShaderStorageBlockFunctionHLSL.h
>+    src/compiler/translator/ShaderStorageBlockOutputHLSL.cpp
>+    src/compiler/translator/ShaderStorageBlockOutputHLSL.h
>+    src/compiler/translator/StructureHLSL.cpp
>+    src/compiler/translator/StructureHLSL.h
>+    src/compiler/translator/TextureFunctionHLSL.cpp
>+    src/compiler/translator/TextureFunctionHLSL.h
>+    src/compiler/translator/ImageFunctionHLSL.cpp
>+    src/compiler/translator/ImageFunctionHLSL.h
>+    src/compiler/translator/TranslatorHLSL.cpp
>+    src/compiler/translator/TranslatorHLSL.h
>+    src/compiler/translator/UtilsHLSL.cpp
>+    src/compiler/translator/UtilsHLSL.h
>+    src/compiler/translator/emulated_builtin_functions_hlsl_autogen.cpp
>+    src/compiler/translator/tree_ops/AddDefaultReturnStatements.cpp
>+    src/compiler/translator/tree_ops/AddDefaultReturnStatements.h
>+    src/compiler/translator/tree_ops/ArrayReturnValueToOutParameter.cpp
>+    src/compiler/translator/tree_ops/ArrayReturnValueToOutParameter.h
>+    src/compiler/translator/tree_ops/RemoveDynamicIndexing.cpp
>+    src/compiler/translator/tree_ops/RemoveDynamicIndexing.h
>+    src/compiler/translator/tree_ops/RemoveSwitchFallThrough.cpp
>+    src/compiler/translator/tree_ops/RemoveSwitchFallThrough.h
>+    src/compiler/translator/tree_ops/RewriteElseBlocks.cpp
>+    src/compiler/translator/tree_ops/RewriteElseBlocks.h
>+    src/compiler/translator/tree_ops/SeparateArrayConstructorStatements.cpp
>+    src/compiler/translator/tree_ops/SeparateArrayConstructorStatements.h
>+    src/compiler/translator/tree_ops/SeparateArrayInitialization.cpp
>+    src/compiler/translator/tree_ops/SeparateArrayInitialization.h
>+    src/compiler/translator/tree_ops/SeparateExpressionsReturningArrays.cpp
>+    src/compiler/translator/tree_ops/SeparateExpressionsReturningArrays.h
>+    src/compiler/translator/tree_ops/UnfoldShortCircuitToIf.cpp
>+    src/compiler/translator/tree_ops/UnfoldShortCircuitToIf.h
>+    src/compiler/translator/tree_ops/WrapSwitchStatementsInBlocks.cpp
>+    src/compiler/translator/tree_ops/WrapSwitchStatementsInBlocks.h
>+)
>+
>+set(angle_translator_lib_vulkan_sources
>+    src/compiler/translator/OutputVulkanGLSL.cpp
>+    src/compiler/translator/OutputVulkanGLSL.h
>+    src/compiler/translator/TranslatorVulkan.cpp
>+    src/compiler/translator/TranslatorVulkan.h
>+)
>+
>+set(angle_preprocessor_sources
>+    src/compiler/preprocessor/DiagnosticsBase.cpp
>+    src/compiler/preprocessor/DiagnosticsBase.h
>+    src/compiler/preprocessor/DirectiveHandlerBase.cpp
>+    src/compiler/preprocessor/DirectiveHandlerBase.h
>+    src/compiler/preprocessor/DirectiveParser.cpp
>+    src/compiler/preprocessor/DirectiveParser.h
>+    src/compiler/preprocessor/ExpressionParser.cpp
>+    src/compiler/preprocessor/ExpressionParser.h
>+    src/compiler/preprocessor/ExpressionParser.y
>+    src/compiler/preprocessor/Input.cpp
>+    src/compiler/preprocessor/Input.h
>+    src/compiler/preprocessor/Lexer.cpp
>+    src/compiler/preprocessor/Lexer.h
>+    src/compiler/preprocessor/Macro.cpp
>+    src/compiler/preprocessor/Macro.h
>+    src/compiler/preprocessor/MacroExpander.cpp
>+    src/compiler/preprocessor/MacroExpander.h
>+    src/compiler/preprocessor/Preprocessor.cpp
>+    src/compiler/preprocessor/Preprocessor.h
>+    src/compiler/preprocessor/SourceLocation.h
>+    src/compiler/preprocessor/Token.cpp
>+    src/compiler/preprocessor/Token.h
>+    src/compiler/preprocessor/Tokenizer.cpp
>+    src/compiler/preprocessor/Tokenizer.h
>+    src/compiler/preprocessor/Tokenizer.l
>+    src/compiler/preprocessor/numeric_lex.h
>+)
>diff --git a/Source/ThirdParty/ANGLE/GLESv2.cmake b/Source/ThirdParty/ANGLE/GLESv2.cmake
>new file mode 100644
>index 00000000000..c45aa99baf3
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/GLESv2.cmake
>@@ -0,0 +1,931 @@
>+# Contains the source file definitions in src/libGLESv2.gn
>+#
>+# This is a direct mapping of ALL values unless otherwise specified. All
>+# declarations are in the same ordering as the original .gn file
>+
>+set(libangle_common_sources
>+    src/common/Color.h
>+    src/common/Color.inl
>+    src/common/FastVector.h
>+    src/common/FixedVector.h
>+    src/common/Float16ToFloat32.cpp
>+    src/common/MemoryBuffer.cpp
>+    src/common/MemoryBuffer.h
>+    src/common/Optional.h
>+    src/common/PackedEGLEnums_autogen.cpp
>+    src/common/PackedEGLEnums_autogen.h
>+    src/common/PackedEnums.cpp
>+    src/common/PackedEnums.h
>+    src/common/PackedGLEnums_autogen.cpp
>+    src/common/PackedGLEnums_autogen.h
>+    src/common/PoolAlloc.cpp
>+    src/common/PoolAlloc.h
>+    src/common/aligned_memory.cpp
>+    src/common/aligned_memory.h
>+    src/common/angleutils.cpp
>+    src/common/angleutils.h
>+    src/common/bitset_utils.h
>+    src/common/debug.cpp
>+    src/common/debug.h
>+    src/common/hash_utils.h
>+    src/common/mathutil.cpp
>+    src/common/mathutil.h
>+    src/common/matrix_utils.cpp
>+    src/common/matrix_utils.h
>+    src/common/platform.h
>+    src/common/string_utils.cpp
>+    src/common/string_utils.h
>+    src/common/third_party/base/anglebase/base_export.h
>+    src/common/third_party/base/anglebase/containers/mru_cache.h
>+    src/common/third_party/base/anglebase/logging.h
>+    src/common/third_party/base/anglebase/macros.h
>+    src/common/third_party/base/anglebase/numerics/safe_conversions.h
>+    src/common/third_party/base/anglebase/numerics/safe_conversions_impl.h
>+    src/common/third_party/base/anglebase/numerics/safe_math.h
>+    src/common/third_party/base/anglebase/numerics/safe_math_impl.h
>+    src/common/third_party/base/anglebase/sha1.cc
>+    src/common/third_party/base/anglebase/sha1.h
>+    src/common/third_party/base/anglebase/sys_byteorder.h
>+    src/common/third_party/smhasher/src/PMurHash.cpp
>+    src/common/third_party/smhasher/src/PMurHash.h
>+    src/common/tls.cpp
>+    src/common/tls.h
>+    src/common/uniform_type_info_autogen.cpp
>+    src/common/utilities.cpp
>+    src/common/utilities.h
>+    src/common/vector_utils.h
>+)
>+
>+set(xxhash_sources
>+    src/common/third_party/xxhash/xxhash.c
>+    src/common/third_party/xxhash/xxhash.h
>+)
>+
>+set(angle_system_utils_sources
>+    src/common/Optional.h
>+    src/common/angleutils.h
>+    src/common/platform.h
>+    src/common/system_utils.cpp
>+    src/common/system_utils.h
>+)
>+
>+# Rather than appending to the angle_system_utils_sources we instead make variables that can be used
>+
>+set(angle_system_utils_sources_linux src/common/system_utils_linux.cpp)
>+set(angle_system_utils_sources_posix src/common/system_utils_posix.cpp)
>+set(angle_system_utils_sources_mac src/common/system_utils_mac.cpp)
>+set(angle_system_utils_sources_win src/common/system_utils_win.cpp)
>+set(angle_system_utils_sources_android
>+    src/common/android_util.cpp
>+    src/common/android_util.h
>+)
>+
>+# end modification
>+
>+set(libangle_image_util_sources
>+    src/image_util/copyimage.cpp
>+    src/image_util/copyimage.h
>+    src/image_util/copyimage.inl
>+    src/image_util/generatemip.h
>+    src/image_util/generatemip.inl
>+    src/image_util/imageformats.cpp
>+    src/image_util/imageformats.h
>+    src/image_util/loadimage.cpp
>+    src/image_util/loadimage.h
>+    src/image_util/loadimage.inl
>+    src/image_util/loadimage_etc.cpp
>+)
>+
>+set(libangle_gpu_info_util_sources
>+    src/gpu_info_util/SystemInfo.cpp
>+    src/gpu_info_util/SystemInfo.h
>+    src/gpu_info_util/SystemInfo_internal.h
>+)
>+
>+set(libangle_gpu_info_util_win_sources src/gpu_info_util/SystemInfo_win.cpp)
>+set(libangle_gpu_info_util_linux_sources src/gpu_info_util/SystemInfo_linux.cpp)
>+set(libangle_gpu_info_util_libpci_sources src/gpu_info_util/SystemInfo_libpci.cpp)
>+set(libangle_gpu_info_util_x11_sources src/gpu_info_util/SystemInfo_x11.cpp)
>+set(libangle_gpu_info_util_mac_sources src/gpu_info_util/SystemInfo_mac.mm)
>+
>+set(libangle_includes
>+    include/angle_gl.h
>+    include/export.h
>+    include/EGL/egl.h
>+    include/EGL/eglext.h
>+    include/EGL/eglext_angle.h
>+    include/EGL/eglplatform.h
>+    include/GLES/gl.h
>+    include/GLES/glplatform.h
>+    include/GLES/glext.h
>+    include/GLES/glext_angle.h
>+    include/GLES/glext_explicit_context_autogen.inc
>+    include/GLES2/gl2.h
>+    include/GLES2/gl2ext.h
>+    include/GLES2/gl2ext_angle.h
>+    include/GLES2/gl2ext_explicit_context_autogen.inc
>+    include/GLES2/gl2platform.h
>+    include/GLES3/gl3.h
>+    include/GLES3/gl3ext_explicit_context_autogen.inc
>+    include/GLES3/gl3platform.h
>+    include/GLES3/gl31.h
>+    include/GLES3/gl31ext_explicit_context_autogen.inc
>+    include/GLES3/gl32.h
>+    include/GLSLANG/ShaderLang.h
>+    include/GLSLANG/ShaderVars.h
>+    include/KHR/khrplatform.h
>+    include/WGL/wgl.h
>+    include/platform/FeaturesVk.h
>+    include/platform/Platform.h
>+    include/platform/WorkaroundsD3D.h)
>+
>+set(libangle_sources
>+    src/common/event_tracer.cpp
>+    src/common/event_tracer.h
>+    src/libANGLE/AttributeMap.cpp
>+    src/libANGLE/AttributeMap.h
>+    src/libANGLE/BinaryStream.h
>+    src/libANGLE/BlobCache.cpp
>+    src/libANGLE/BlobCache.h
>+    src/libANGLE/Buffer.cpp
>+    src/libANGLE/Buffer.h
>+    src/libANGLE/Caps.cpp
>+    src/libANGLE/Caps.h
>+    src/libANGLE/Compiler.cpp
>+    src/libANGLE/Compiler.h
>+    src/libANGLE/Config.cpp
>+    src/libANGLE/Config.h
>+    src/libANGLE/Constants.h
>+    src/libANGLE/Context.cpp
>+    src/libANGLE/Context_gles_1_0.cpp
>+    src/libANGLE/Context_gles_1_0_autogen.h
>+    src/libANGLE/Context.h
>+    src/libANGLE/Debug.cpp
>+    src/libANGLE/Debug.h
>+    src/libANGLE/Device.cpp
>+    src/libANGLE/Device.h
>+    src/libANGLE/Display.cpp
>+    src/libANGLE/Display.h
>+    src/libANGLE/EGLSync.cpp
>+    src/libANGLE/EGLSync.h
>+    src/libANGLE/Error.cpp
>+    src/libANGLE/Error.h
>+    src/libANGLE/Error.inl
>+    src/libANGLE/ErrorStrings.h
>+    src/libANGLE/Fence.cpp
>+    src/libANGLE/Fence.h
>+    src/libANGLE/Framebuffer.cpp
>+    src/libANGLE/Framebuffer.h
>+    src/libANGLE/FramebufferAttachment.cpp
>+    src/libANGLE/FramebufferAttachment.h
>+    src/libANGLE/GLES1Renderer.cpp
>+    src/libANGLE/GLES1Renderer.h
>+    src/libANGLE/GLES1Shaders.inc
>+    src/libANGLE/GLES1State.cpp
>+    src/libANGLE/GLES1State.h
>+    src/libANGLE/HandleAllocator.cpp
>+    src/libANGLE/HandleAllocator.h
>+    src/libANGLE/HandleRangeAllocator.h
>+    src/libANGLE/HandleRangeAllocator.cpp
>+    src/libANGLE/Image.h
>+    src/libANGLE/Image.cpp
>+    src/libANGLE/ImageIndex.h
>+    src/libANGLE/ImageIndex.cpp
>+    src/libANGLE/IndexRangeCache.cpp
>+    src/libANGLE/IndexRangeCache.h
>+    src/libANGLE/LoggingAnnotator.cpp
>+    src/libANGLE/LoggingAnnotator.h
>+    src/libANGLE/MemoryObject.cpp
>+    src/libANGLE/MemoryObject.h
>+    src/libANGLE/MemoryProgramCache.cpp
>+    src/libANGLE/MemoryProgramCache.h
>+    src/libANGLE/Observer.cpp
>+    src/libANGLE/Observer.h
>+    src/libANGLE/Path.h
>+    src/libANGLE/Path.cpp
>+    src/libANGLE/Platform.cpp
>+    src/libANGLE/Program.cpp
>+    src/libANGLE/Program.h
>+    src/libANGLE/ProgramLinkedResources.cpp
>+    src/libANGLE/ProgramLinkedResources.h
>+    src/libANGLE/ProgramPipeline.cpp
>+    src/libANGLE/ProgramPipeline.h
>+    src/libANGLE/Query.cpp
>+    src/libANGLE/Query.h
>+    src/libANGLE/RefCountObject.h
>+    src/libANGLE/Renderbuffer.cpp
>+    src/libANGLE/Renderbuffer.h
>+    src/libANGLE/ResourceManager.cpp
>+    src/libANGLE/ResourceManager.h
>+    src/libANGLE/ResourceMap.h
>+    src/libANGLE/Sampler.cpp
>+    src/libANGLE/Sampler.h
>+    src/libANGLE/Shader.cpp
>+    src/libANGLE/Shader.h
>+    src/libANGLE/SizedMRUCache.h
>+    src/libANGLE/State.cpp
>+    src/libANGLE/State.h
>+    src/libANGLE/Stream.cpp
>+    src/libANGLE/Stream.h
>+    src/libANGLE/Surface.cpp
>+    src/libANGLE/Surface.h
>+    src/libANGLE/Texture.cpp
>+    src/libANGLE/Texture.h
>+    src/libANGLE/Thread.cpp
>+    src/libANGLE/Thread.h
>+    src/libANGLE/TransformFeedback.cpp
>+    src/libANGLE/TransformFeedback.h
>+    src/libANGLE/Uniform.cpp
>+    src/libANGLE/Uniform.h
>+    src/libANGLE/VaryingPacking.cpp
>+    src/libANGLE/VaryingPacking.h
>+    src/libANGLE/Version.h
>+    src/libANGLE/Version.inl
>+    src/libANGLE/VertexArray.cpp
>+    src/libANGLE/VertexArray.h
>+    src/libANGLE/VertexAttribute.cpp
>+    src/libANGLE/VertexAttribute.h
>+    src/libANGLE/VertexAttribute.inl
>+    src/libANGLE/Workarounds.h
>+    src/libANGLE/WorkerThread.cpp
>+    src/libANGLE/WorkerThread.h
>+    src/libANGLE/angletypes.cpp
>+    src/libANGLE/angletypes.h
>+    src/libANGLE/angletypes.inl
>+    src/libANGLE/es3_copy_conversion_table_autogen.cpp
>+    src/libANGLE/features.h
>+    src/libANGLE/format_map_autogen.cpp
>+    src/libANGLE/formatutils.cpp
>+    src/libANGLE/formatutils.h
>+    src/libANGLE/histogram_macros.h
>+    src/libANGLE/queryconversions.cpp
>+    src/libANGLE/queryconversions.h
>+    src/libANGLE/queryutils.cpp
>+    src/libANGLE/queryutils.h
>+    src/libANGLE/renderer/BufferImpl.h
>+    src/libANGLE/renderer/CompilerImpl.h
>+    src/libANGLE/renderer/ContextImpl.cpp
>+    src/libANGLE/renderer/ContextImpl.h
>+    src/libANGLE/renderer/driver_utils.cpp
>+    src/libANGLE/renderer/driver_utils.h
>+    src/libANGLE/renderer/DeviceImpl.cpp
>+    src/libANGLE/renderer/DeviceImpl.h
>+    src/libANGLE/renderer/DisplayImpl.cpp
>+    src/libANGLE/renderer/DisplayImpl.h
>+    src/libANGLE/renderer/EGLImplFactory.h
>+    src/libANGLE/renderer/EGLSyncImpl.h
>+    src/libANGLE/renderer/FenceNVImpl.h
>+    src/libANGLE/renderer/FormatID_autogen.h
>+    src/libANGLE/renderer/Format_table_autogen.cpp
>+    src/libANGLE/renderer/Format.h
>+    src/libANGLE/renderer/FramebufferAttachmentObjectImpl.h
>+    src/libANGLE/renderer/FramebufferImpl.h
>+    src/libANGLE/renderer/GLImplFactory.h
>+    src/libANGLE/renderer/ImageImpl.h
>+    src/libANGLE/renderer/MemoryObjectImpl.h
>+    src/libANGLE/renderer/PathImpl.h
>+    src/libANGLE/renderer/ProgramImpl.h
>+    src/libANGLE/renderer/ProgramPipelineImpl.h
>+    src/libANGLE/renderer/QueryImpl.cpp
>+    src/libANGLE/renderer/QueryImpl.h
>+    src/libANGLE/renderer/RenderbufferImpl.h
>+    src/libANGLE/renderer/RenderTargetCache.h
>+    src/libANGLE/renderer/SamplerImpl.h
>+    src/libANGLE/renderer/ShaderImpl.cpp
>+    src/libANGLE/renderer/ShaderImpl.h
>+    src/libANGLE/renderer/StreamProducerImpl.h
>+    src/libANGLE/renderer/SurfaceImpl.cpp
>+    src/libANGLE/renderer/SurfaceImpl.h
>+    src/libANGLE/renderer/SyncImpl.h
>+    src/libANGLE/renderer/TextureImpl.cpp
>+    src/libANGLE/renderer/TextureImpl.h
>+    src/libANGLE/renderer/TransformFeedbackImpl.h
>+    src/libANGLE/renderer/VertexArrayImpl.h
>+    src/libANGLE/renderer/copyvertex.h
>+    src/libANGLE/renderer/copyvertex.inc.h
>+    src/libANGLE/renderer/load_functions_table.h
>+    src/libANGLE/renderer/load_functions_table_autogen.cpp
>+    src/libANGLE/renderer/renderer_utils.cpp
>+    src/libANGLE/renderer/renderer_utils.h
>+    src/libANGLE/validationEGL.cpp
>+    src/libANGLE/validationEGL.h
>+    src/libANGLE/validationES.cpp
>+    src/libANGLE/validationES.h
>+    src/libANGLE/validationES1.cpp
>+    src/libANGLE/validationES1_autogen.h
>+    src/libANGLE/validationES1.h
>+    src/libANGLE/validationES2.cpp
>+    src/libANGLE/validationES2_autogen.h
>+    src/libANGLE/validationES2.h
>+    src/libANGLE/validationES3.cpp
>+    src/libANGLE/validationES31.cpp
>+    src/libANGLE/validationES31_autogen.h
>+    src/libANGLE/validationES31.h
>+    src/libANGLE/validationES3_autogen.h
>+    src/libANGLE/validationES3.h
>+    src/libANGLE/validationESEXT_autogen.h
>+    src/libANGLE/validationESEXT.h
>+    src/third_party/trace_event/trace_event.h
>+)
>+
>+set(libangle_d3d_shared_sources
>+    src/libANGLE/renderer/d3d/BufferD3D.cpp
>+    src/libANGLE/renderer/d3d/BufferD3D.h
>+    src/libANGLE/renderer/d3d/CompilerD3D.cpp
>+    src/libANGLE/renderer/d3d/CompilerD3D.h
>+    src/libANGLE/renderer/d3d/ContextD3D.h
>+    src/libANGLE/renderer/d3d/DeviceD3D.cpp
>+    src/libANGLE/renderer/d3d/DeviceD3D.h
>+    src/libANGLE/renderer/d3d/DisplayD3D.cpp
>+    src/libANGLE/renderer/d3d/DisplayD3D.h
>+    src/libANGLE/renderer/d3d/DynamicHLSL.cpp
>+    src/libANGLE/renderer/d3d/DynamicHLSL.h
>+    src/libANGLE/renderer/d3d/DynamicImage2DHLSL.cpp
>+    src/libANGLE/renderer/d3d/DynamicImage2DHLSL.h
>+    src/libANGLE/renderer/d3d/EGLImageD3D.cpp
>+    src/libANGLE/renderer/d3d/EGLImageD3D.h
>+    src/libANGLE/renderer/d3d/formatutilsD3D.h
>+    src/libANGLE/renderer/d3d/FramebufferD3D.cpp
>+    src/libANGLE/renderer/d3d/FramebufferD3D.h
>+    src/libANGLE/renderer/d3d/HLSLCompiler.cpp
>+    src/libANGLE/renderer/d3d/HLSLCompiler.h
>+    src/libANGLE/renderer/d3d/ImageD3D.cpp
>+    src/libANGLE/renderer/d3d/ImageD3D.h
>+    src/libANGLE/renderer/d3d/IndexBuffer.cpp
>+    src/libANGLE/renderer/d3d/IndexBuffer.h
>+    src/libANGLE/renderer/d3d/IndexDataManager.cpp
>+    src/libANGLE/renderer/d3d/IndexDataManager.h
>+    src/libANGLE/renderer/d3d/NativeWindowD3D.cpp
>+    src/libANGLE/renderer/d3d/NativeWindowD3D.h
>+    src/libANGLE/renderer/d3d/ProgramD3D.cpp
>+    src/libANGLE/renderer/d3d/ProgramD3D.h
>+    src/libANGLE/renderer/d3d/RenderbufferD3D.cpp
>+    src/libANGLE/renderer/d3d/RenderbufferD3D.h
>+    src/libANGLE/renderer/d3d/RendererD3D.cpp
>+    src/libANGLE/renderer/d3d/RendererD3D.h
>+    src/libANGLE/renderer/d3d/RenderTargetD3D.h
>+    src/libANGLE/renderer/d3d/RenderTargetD3D.cpp
>+    src/libANGLE/renderer/d3d/SamplerD3D.h
>+    src/libANGLE/renderer/d3d/ShaderD3D.cpp
>+    src/libANGLE/renderer/d3d/ShaderD3D.h
>+    src/libANGLE/renderer/d3d/ShaderExecutableD3D.cpp
>+    src/libANGLE/renderer/d3d/ShaderExecutableD3D.h
>+    src/libANGLE/renderer/d3d/SurfaceD3D.cpp
>+    src/libANGLE/renderer/d3d/SurfaceD3D.h
>+    src/libANGLE/renderer/d3d/SwapChainD3D.cpp
>+    src/libANGLE/renderer/d3d/SwapChainD3D.h
>+    src/libANGLE/renderer/d3d/TextureD3D.cpp
>+    src/libANGLE/renderer/d3d/TextureD3D.h
>+    src/libANGLE/renderer/d3d/TextureStorage.h
>+    src/libANGLE/renderer/d3d/VertexBuffer.cpp
>+    src/libANGLE/renderer/d3d/VertexBuffer.h
>+    src/libANGLE/renderer/d3d/VertexDataManager.cpp
>+    src/libANGLE/renderer/d3d/VertexDataManager.h
>+)
>+set(libangle_d3d9_sources
>+    src/libANGLE/renderer/d3d/d3d9/Blit9.cpp
>+    src/libANGLE/renderer/d3d/d3d9/Blit9.h
>+    src/libANGLE/renderer/d3d/d3d9/Buffer9.cpp
>+    src/libANGLE/renderer/d3d/d3d9/Buffer9.h
>+    src/libANGLE/renderer/d3d/d3d9/Context9.cpp
>+    src/libANGLE/renderer/d3d/d3d9/Context9.h
>+    src/libANGLE/renderer/d3d/d3d9/DebugAnnotator9.cpp
>+    src/libANGLE/renderer/d3d/d3d9/DebugAnnotator9.h
>+    src/libANGLE/renderer/d3d/d3d9/Fence9.cpp
>+    src/libANGLE/renderer/d3d/d3d9/Fence9.h
>+    src/libANGLE/renderer/d3d/d3d9/formatutils9.cpp
>+    src/libANGLE/renderer/d3d/d3d9/formatutils9.h
>+    src/libANGLE/renderer/d3d/d3d9/Framebuffer9.cpp
>+    src/libANGLE/renderer/d3d/d3d9/Framebuffer9.h
>+    src/libANGLE/renderer/d3d/d3d9/Image9.cpp
>+    src/libANGLE/renderer/d3d/d3d9/Image9.h
>+    src/libANGLE/renderer/d3d/d3d9/IndexBuffer9.cpp
>+    src/libANGLE/renderer/d3d/d3d9/IndexBuffer9.h
>+    src/libANGLE/renderer/d3d/d3d9/NativeWindow9.cpp
>+    src/libANGLE/renderer/d3d/d3d9/NativeWindow9.h
>+    src/libANGLE/renderer/d3d/d3d9/Query9.cpp
>+    src/libANGLE/renderer/d3d/d3d9/Query9.h
>+    src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp
>+    src/libANGLE/renderer/d3d/d3d9/Renderer9.h
>+    src/libANGLE/renderer/d3d/d3d9/renderer9_utils.cpp
>+    src/libANGLE/renderer/d3d/d3d9/renderer9_utils.h
>+    src/libANGLE/renderer/d3d/d3d9/RenderTarget9.cpp
>+    src/libANGLE/renderer/d3d/d3d9/RenderTarget9.h
>+    src/libANGLE/renderer/d3d/d3d9/ShaderCache.h
>+    src/libANGLE/renderer/d3d/d3d9/ShaderExecutable9.cpp
>+    src/libANGLE/renderer/d3d/d3d9/ShaderExecutable9.h
>+    src/libANGLE/renderer/d3d/d3d9/shaders/compiled/componentmaskps.h
>+    src/libANGLE/renderer/d3d/d3d9/shaders/compiled/componentmaskpremultps.h
>+    src/libANGLE/renderer/d3d/d3d9/shaders/compiled/componentmaskunmultps.h
>+    src/libANGLE/renderer/d3d/d3d9/shaders/compiled/luminanceps.h
>+    src/libANGLE/renderer/d3d/d3d9/shaders/compiled/luminancepremultps.h
>+    src/libANGLE/renderer/d3d/d3d9/shaders/compiled/luminanceunmultps.h
>+    src/libANGLE/renderer/d3d/d3d9/shaders/compiled/passthroughps.h
>+    src/libANGLE/renderer/d3d/d3d9/shaders/compiled/standardvs.h
>+    src/libANGLE/renderer/d3d/d3d9/StateManager9.cpp
>+    src/libANGLE/renderer/d3d/d3d9/StateManager9.h
>+    src/libANGLE/renderer/d3d/d3d9/SwapChain9.cpp
>+    src/libANGLE/renderer/d3d/d3d9/SwapChain9.h
>+    src/libANGLE/renderer/d3d/d3d9/TextureStorage9.cpp
>+    src/libANGLE/renderer/d3d/d3d9/TextureStorage9.h
>+    src/libANGLE/renderer/d3d/d3d9/VertexArray9.h
>+    src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.cpp
>+    src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.h
>+    src/libANGLE/renderer/d3d/d3d9/vertexconversion.h
>+    src/libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.cpp
>+    src/libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.h
>+)
>+
>+set(libangle_d3d11_sources
>+    src/libANGLE/renderer/d3d/d3d11/Blit11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/Blit11.h
>+    src/libANGLE/renderer/d3d/d3d11/Blit11Helper_autogen.inc
>+    src/libANGLE/renderer/d3d/d3d11/Buffer11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/Buffer11.h
>+    src/libANGLE/renderer/d3d/d3d11/Clear11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/Clear11.h
>+    src/libANGLE/renderer/d3d/d3d11/Context11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/Context11.h
>+    src/libANGLE/renderer/d3d/d3d11/DebugAnnotator11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/DebugAnnotator11.h
>+    src/libANGLE/renderer/d3d/d3d11/dxgi_format_map_autogen.cpp
>+    src/libANGLE/renderer/d3d/d3d11/dxgi_support_table_autogen.cpp
>+    src/libANGLE/renderer/d3d/d3d11/dxgi_support_table.h
>+    src/libANGLE/renderer/d3d/d3d11/Fence11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/Fence11.h
>+    src/libANGLE/renderer/d3d/d3d11/formatutils11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/formatutils11.h
>+    src/libANGLE/renderer/d3d/d3d11/Framebuffer11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/Framebuffer11.h
>+    src/libANGLE/renderer/d3d/d3d11/Image11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/Image11.h
>+    src/libANGLE/renderer/d3d/d3d11/IndexBuffer11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/IndexBuffer11.h
>+    src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.cpp
>+    src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.h
>+    src/libANGLE/renderer/d3d/d3d11/NativeWindow11.h
>+    src/libANGLE/renderer/d3d/d3d11/PixelTransfer11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/PixelTransfer11.h
>+    src/libANGLE/renderer/d3d/d3d11/Program11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/Program11.h
>+    src/libANGLE/renderer/d3d/d3d11/ProgramPipeline11.cpp
>+    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
>+    src/libANGLE/renderer/d3d/d3d11/RenderStateCache.h
>+    src/libANGLE/renderer/d3d/d3d11/RenderTarget11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/RenderTarget11.h
>+    src/libANGLE/renderer/d3d/d3d11/ResourceManager11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/ResourceManager11.h
>+    src/libANGLE/renderer/d3d/d3d11/ShaderExecutable11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/ShaderExecutable11.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_gs.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4f.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4i.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4ui.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_vs.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11_fl9vs.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11multiviewgs.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11multiviewvs.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11vs.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/cleardepth11ps.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11_fl9ps.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps1.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps2.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps3.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps4.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps5.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps6.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps7.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps8.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps1.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps2.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps3.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps4.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps5.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps6.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps7.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps8.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps1.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps2.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps3.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps4.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps5.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps6.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps7.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps8.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrough2d11vs.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrough3d11gs.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrough3d11vs.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughdepth2d11ps.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvecolor2dps.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvedepth11_ps.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvedepthstencil11_ps.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvedepthstencil11_vs.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvestencil11_ps.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlef2darrayps.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlef2dps.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlef3dps.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlei2darrayps.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlei2dps.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlei3dps.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzleui2darrayps.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzleui2dps.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzleui3dps.h
>+    src/libANGLE/renderer/d3d/d3d11/StateManager11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/StateManager11.h
>+    src/libANGLE/renderer/d3d/d3d11/StreamProducerD3DTexture.cpp
>+    src/libANGLE/renderer/d3d/d3d11/StreamProducerD3DTexture.h
>+    src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/SwapChain11.h
>+    src/libANGLE/renderer/d3d/d3d11/texture_format_table.cpp
>+    src/libANGLE/renderer/d3d/d3d11/texture_format_table.h
>+    src/libANGLE/renderer/d3d/d3d11/texture_format_table_autogen.cpp
>+    src/libANGLE/renderer/d3d/d3d11/texture_format_table_utils.h
>+    src/libANGLE/renderer/d3d/d3d11/TextureStorage11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/TextureStorage11.h
>+    src/libANGLE/renderer/d3d/d3d11/TransformFeedback11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/TransformFeedback11.h
>+    src/libANGLE/renderer/d3d/d3d11/Trim11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/Trim11.h
>+    src/libANGLE/renderer/d3d/d3d11/VertexArray11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/VertexArray11.h
>+    src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.h
>+)
>+
>+set(libangle_d3d11_win32_sources
>+    src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.cpp
>+    src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.h
>+    src/libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.h
>+    src/third_party/systeminfo/SystemInfo.cpp
>+    src/third_party/systeminfo/SystemInfo.h
>+)
>+
>+set(libangle_d3d11_winrt_sources
>+    src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp
>+    src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.h
>+    src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.cpp
>+    src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.h
>+    src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.cpp
>+    src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.h
>+    src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.cpp
>+    src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h
>+)
>+
>+set(libangle_gl_sources
>+    src/libANGLE/renderer/gl/BlitGL.cpp
>+    src/libANGLE/renderer/gl/BlitGL.h
>+    src/libANGLE/renderer/gl/BufferGL.cpp
>+    src/libANGLE/renderer/gl/BufferGL.h
>+    src/libANGLE/renderer/gl/ClearMultiviewGL.cpp
>+    src/libANGLE/renderer/gl/ClearMultiviewGL.h
>+    src/libANGLE/renderer/gl/CompilerGL.cpp
>+    src/libANGLE/renderer/gl/CompilerGL.h
>+    src/libANGLE/renderer/gl/ContextGL.cpp
>+    src/libANGLE/renderer/gl/ContextGL.h
>+    src/libANGLE/renderer/gl/DispatchTableGL_autogen.cpp
>+    src/libANGLE/renderer/gl/DispatchTableGL_autogen.h
>+    src/libANGLE/renderer/gl/DisplayGL.cpp
>+    src/libANGLE/renderer/gl/DisplayGL.h
>+    src/libANGLE/renderer/gl/FenceNVGL.cpp
>+    src/libANGLE/renderer/gl/FenceNVGL.h
>+    src/libANGLE/renderer/gl/FramebufferGL.cpp
>+    src/libANGLE/renderer/gl/FramebufferGL.h
>+    src/libANGLE/renderer/gl/FunctionsGL.cpp
>+    src/libANGLE/renderer/gl/FunctionsGL.h
>+    src/libANGLE/renderer/gl/ImageGL.cpp
>+    src/libANGLE/renderer/gl/ImageGL.h
>+    src/libANGLE/renderer/gl/PathGL.h
>+    src/libANGLE/renderer/gl/PathGL.cpp
>+    src/libANGLE/renderer/gl/ProgramGL.cpp
>+    src/libANGLE/renderer/gl/ProgramGL.h
>+    src/libANGLE/renderer/gl/ProgramPipelineGL.cpp
>+    src/libANGLE/renderer/gl/ProgramPipelineGL.h
>+    src/libANGLE/renderer/gl/QueryGL.cpp
>+    src/libANGLE/renderer/gl/QueryGL.h
>+    src/libANGLE/renderer/gl/RenderbufferGL.cpp
>+    src/libANGLE/renderer/gl/RenderbufferGL.h
>+    src/libANGLE/renderer/gl/RendererGL.cpp
>+    src/libANGLE/renderer/gl/RendererGL.h
>+    src/libANGLE/renderer/gl/SamplerGL.cpp
>+    src/libANGLE/renderer/gl/SamplerGL.h
>+    src/libANGLE/renderer/gl/ShaderGL.cpp
>+    src/libANGLE/renderer/gl/ShaderGL.h
>+    src/libANGLE/renderer/gl/StateManagerGL.cpp
>+    src/libANGLE/renderer/gl/StateManagerGL.h
>+    src/libANGLE/renderer/gl/SurfaceGL.cpp
>+    src/libANGLE/renderer/gl/SurfaceGL.h
>+    src/libANGLE/renderer/gl/SyncGL.cpp
>+    src/libANGLE/renderer/gl/SyncGL.h
>+    src/libANGLE/renderer/gl/TextureGL.cpp
>+    src/libANGLE/renderer/gl/TextureGL.h
>+    src/libANGLE/renderer/gl/TransformFeedbackGL.cpp
>+    src/libANGLE/renderer/gl/TransformFeedbackGL.h
>+    src/libANGLE/renderer/gl/VertexArrayGL.cpp
>+    src/libANGLE/renderer/gl/VertexArrayGL.h
>+    src/libANGLE/renderer/gl/WorkaroundsGL.h
>+    src/libANGLE/renderer/gl/formatutilsgl.cpp
>+    src/libANGLE/renderer/gl/formatutilsgl.h
>+    src/libANGLE/renderer/gl/functionsgl_enums.h
>+    src/libANGLE/renderer/gl/functionsgl_typedefs.h
>+    src/libANGLE/renderer/gl/renderergl_utils.cpp
>+    src/libANGLE/renderer/gl/renderergl_utils.h
>+)
>+
>+set(libangle_gl_null_sources
>+    src/libANGLE/renderer/gl/null_functions.cpp
>+    src/libANGLE/renderer/gl/null_functions.h
>+)
>+
>+set(libangle_gl_wgl_sources
>+    src/libANGLE/renderer/gl/wgl/ContextWGL.cpp
>+    src/libANGLE/renderer/gl/wgl/ContextWGL.h
>+    src/libANGLE/renderer/gl/wgl/D3DTextureSurfaceWGL.cpp
>+    src/libANGLE/renderer/gl/wgl/D3DTextureSurfaceWGL.h
>+    src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp
>+    src/libANGLE/renderer/gl/wgl/DisplayWGL.h
>+    src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.cpp
>+    src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.h
>+    src/libANGLE/renderer/gl/wgl/FunctionsWGL.cpp
>+    src/libANGLE/renderer/gl/wgl/FunctionsWGL.h
>+    src/libANGLE/renderer/gl/wgl/PbufferSurfaceWGL.cpp
>+    src/libANGLE/renderer/gl/wgl/PbufferSurfaceWGL.h
>+    src/libANGLE/renderer/gl/wgl/RendererWGL.cpp
>+    src/libANGLE/renderer/gl/wgl/RendererWGL.h
>+    src/libANGLE/renderer/gl/wgl/SurfaceWGL.h
>+    src/libANGLE/renderer/gl/wgl/WindowSurfaceWGL.cpp
>+    src/libANGLE/renderer/gl/wgl/WindowSurfaceWGL.h
>+    src/libANGLE/renderer/gl/wgl/functionswgl_typedefs.h
>+    src/libANGLE/renderer/gl/wgl/wgl_utils.cpp
>+    src/libANGLE/renderer/gl/wgl/wgl_utils.h
>+    src/third_party/khronos/GL/wglext.h
>+)
>+
>+set(libangle_gl_glx_sources
>+    src/libANGLE/renderer/gl/glx/DisplayGLX.cpp
>+    src/libANGLE/renderer/gl/glx/DisplayGLX.h
>+    src/libANGLE/renderer/gl/glx/FunctionsGLX.cpp
>+    src/libANGLE/renderer/gl/glx/FunctionsGLX.h
>+    src/libANGLE/renderer/gl/glx/RendererGLX.h
>+    src/libANGLE/renderer/gl/glx/RendererGLX.cpp
>+    src/libANGLE/renderer/gl/glx/PbufferSurfaceGLX.cpp
>+    src/libANGLE/renderer/gl/glx/PbufferSurfaceGLX.h
>+    src/libANGLE/renderer/gl/glx/SurfaceGLX.h
>+    src/libANGLE/renderer/gl/glx/WindowSurfaceGLX.cpp
>+    src/libANGLE/renderer/gl/glx/WindowSurfaceGLX.h
>+    src/libANGLE/renderer/gl/glx/functionsglx_typedefs.h
>+    src/libANGLE/renderer/gl/glx/platform_glx.h
>+)
>+
>+set(libangle_gl_egl_sources
>+    src/libANGLE/renderer/gl/egl/ContextEGL.cpp
>+    src/libANGLE/renderer/gl/egl/ContextEGL.h
>+    src/libANGLE/renderer/gl/egl/DisplayEGL.cpp
>+    src/libANGLE/renderer/gl/egl/DisplayEGL.h
>+    src/libANGLE/renderer/gl/egl/ExternalImageSiblingEGL.h
>+    src/libANGLE/renderer/gl/egl/egl_utils.cpp
>+    src/libANGLE/renderer/gl/egl/egl_utils.h
>+    src/libANGLE/renderer/gl/egl/FunctionsEGL.cpp
>+    src/libANGLE/renderer/gl/egl/FunctionsEGL.h
>+    src/libANGLE/renderer/gl/egl/ImageEGL.cpp
>+    src/libANGLE/renderer/gl/egl/ImageEGL.h
>+    src/libANGLE/renderer/gl/egl/functionsegl_typedefs.h
>+    src/libANGLE/renderer/gl/egl/PbufferSurfaceEGL.cpp
>+    src/libANGLE/renderer/gl/egl/PbufferSurfaceEGL.h
>+    src/libANGLE/renderer/gl/egl/RendererEGL.cpp
>+    src/libANGLE/renderer/gl/egl/RendererEGL.h
>+    src/libANGLE/renderer/gl/egl/SurfaceEGL.cpp
>+    src/libANGLE/renderer/gl/egl/SurfaceEGL.h
>+    src/libANGLE/renderer/gl/egl/SyncEGL.cpp
>+    src/libANGLE/renderer/gl/egl/SyncEGL.h
>+    src/libANGLE/renderer/gl/egl/WindowSurfaceEGL.cpp
>+    src/libANGLE/renderer/gl/egl/WindowSurfaceEGL.h
>+)
>+
>+set(libangle_gl_egl_dl_sources
>+    src/libANGLE/renderer/gl/egl/FunctionsEGLDL.cpp
>+    src/libANGLE/renderer/gl/egl/FunctionsEGLDL.h
>+)
>+
>+set(libangle_gl_ozone_sources
>+    src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.cpp
>+    src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.h
>+    src/libANGLE/renderer/gl/egl/ozone/SurfaceOzone.cpp
>+    src/libANGLE/renderer/gl/egl/ozone/SurfaceOzone.h
>+)
>+
>+set(libangle_gl_egl_android_sources
>+    src/libANGLE/renderer/gl/egl/android/DisplayAndroid.cpp
>+    src/libANGLE/renderer/gl/egl/android/DisplayAndroid.h
>+    src/libANGLE/renderer/gl/egl/android/NativeBufferImageSiblingAndroid.cpp
>+    src/libANGLE/renderer/gl/egl/android/NativeBufferImageSiblingAndroid.h
>+)
>+
>+set(libangle_gl_cgl_sources
>+    src/libANGLE/renderer/gl/cgl/ContextCGL.cpp
>+    src/libANGLE/renderer/gl/cgl/ContextCGL.h
>+    src/libANGLE/renderer/gl/cgl/DisplayCGL.mm
>+    src/libANGLE/renderer/gl/cgl/DisplayCGL.h
>+    src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.mm
>+    src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.h
>+    src/libANGLE/renderer/gl/cgl/RendererCGL.mm
>+    src/libANGLE/renderer/gl/cgl/RendererCGL.h
>+    src/libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.mm
>+    src/libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.h
>+    src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm
>+    src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.h
>+)
>+
>+set(libangle_vulkan_sources
>+    src/libANGLE/renderer/vulkan/BufferVk.cpp
>+    src/libANGLE/renderer/vulkan/BufferVk.h
>+    src/libANGLE/renderer/vulkan/CommandGraph.cpp
>+    src/libANGLE/renderer/vulkan/CommandGraph.h
>+    src/libANGLE/renderer/vulkan/CompilerVk.cpp
>+    src/libANGLE/renderer/vulkan/CompilerVk.h
>+    src/libANGLE/renderer/vulkan/ContextVk.cpp
>+    src/libANGLE/renderer/vulkan/ContextVk.h
>+    src/libANGLE/renderer/vulkan/DeviceVk.cpp
>+    src/libANGLE/renderer/vulkan/DeviceVk.h
>+    src/libANGLE/renderer/vulkan/DisplayVk.cpp
>+    src/libANGLE/renderer/vulkan/DisplayVk.h
>+    src/libANGLE/renderer/vulkan/FenceNVVk.cpp
>+    src/libANGLE/renderer/vulkan/FenceNVVk.h
>+    src/libANGLE/renderer/vulkan/FramebufferVk.cpp
>+    src/libANGLE/renderer/vulkan/FramebufferVk.h
>+    src/libANGLE/renderer/vulkan/GlslangWrapper.cpp
>+    src/libANGLE/renderer/vulkan/GlslangWrapper.h
>+    src/libANGLE/renderer/vulkan/ImageVk.cpp
>+    src/libANGLE/renderer/vulkan/ImageVk.h
>+    src/libANGLE/renderer/vulkan/MemoryObjectVk.cpp
>+    src/libANGLE/renderer/vulkan/MemoryObjectVk.h
>+    src/libANGLE/renderer/vulkan/ProgramVk.cpp
>+    src/libANGLE/renderer/vulkan/ProgramVk.h
>+    src/libANGLE/renderer/vulkan/ProgramPipelineVk.cpp
>+    src/libANGLE/renderer/vulkan/ProgramPipelineVk.h
>+    src/libANGLE/renderer/vulkan/QueryVk.cpp
>+    src/libANGLE/renderer/vulkan/QueryVk.h
>+    src/libANGLE/renderer/vulkan/RenderbufferVk.cpp
>+    src/libANGLE/renderer/vulkan/RenderbufferVk.h
>+    src/libANGLE/renderer/vulkan/RendererVk.cpp
>+    src/libANGLE/renderer/vulkan/RendererVk.h
>+    src/libANGLE/renderer/vulkan/RenderTargetVk.cpp
>+    src/libANGLE/renderer/vulkan/RenderTargetVk.h
>+    src/libANGLE/renderer/vulkan/SamplerVk.cpp
>+    src/libANGLE/renderer/vulkan/SamplerVk.h
>+    src/libANGLE/renderer/vulkan/SecondaryCommandBuffer.cpp
>+    src/libANGLE/renderer/vulkan/SecondaryCommandBuffer.h
>+    src/libANGLE/renderer/vulkan/ShaderVk.cpp
>+    src/libANGLE/renderer/vulkan/ShaderVk.h
>+    src/libANGLE/renderer/vulkan/SurfaceVk.cpp
>+    src/libANGLE/renderer/vulkan/SurfaceVk.h
>+    src/libANGLE/renderer/vulkan/SyncVk.cpp
>+    src/libANGLE/renderer/vulkan/SyncVk.h
>+    src/libANGLE/renderer/vulkan/TextureVk.cpp
>+    src/libANGLE/renderer/vulkan/TextureVk.h
>+    src/libANGLE/renderer/vulkan/TransformFeedbackVk.cpp
>+    src/libANGLE/renderer/vulkan/TransformFeedbackVk.h
>+    src/libANGLE/renderer/vulkan/UtilsVk.cpp
>+    src/libANGLE/renderer/vulkan/UtilsVk.h
>+    src/libANGLE/renderer/vulkan/VertexArrayVk.cpp
>+    src/libANGLE/renderer/vulkan/VertexArrayVk.h
>+    src/libANGLE/renderer/vulkan/vk_cache_utils.cpp
>+    src/libANGLE/renderer/vulkan/vk_cache_utils.h
>+    src/libANGLE/renderer/vulkan/vk_caps_utils.cpp
>+    src/libANGLE/renderer/vulkan/vk_caps_utils.h
>+    src/libANGLE/renderer/vulkan/vk_format_table_autogen.cpp
>+    src/libANGLE/renderer/vulkan/vk_format_utils.h
>+    src/libANGLE/renderer/vulkan/vk_format_utils.cpp
>+    src/libANGLE/renderer/vulkan/vk_helpers.cpp
>+    src/libANGLE/renderer/vulkan/vk_helpers.h
>+    src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.h
>+    src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.cpp
>+    src/libANGLE/renderer/vulkan/vk_mandatory_format_support_table_autogen.cpp
>+    src/libANGLE/renderer/vulkan/vk_utils.cpp
>+    src/libANGLE/renderer/vulkan/vk_utils.h
>+    src/libANGLE/renderer/vulkan/vk_wrapper.h
>+)
>+
>+set(libangle_vulkan_android_sources
>+    src/libANGLE/renderer/vulkan/android/DisplayVkAndroid.cpp
>+    src/libANGLE/renderer/vulkan/android/DisplayVkAndroid.h
>+    src/libANGLE/renderer/vulkan/android/HardwareBufferImageSiblingVkAndroid.cpp
>+    src/libANGLE/renderer/vulkan/android/HardwareBufferImageSiblingVkAndroid.h
>+    src/libANGLE/renderer/vulkan/android/WindowSurfaceVkAndroid.cpp
>+    src/libANGLE/renderer/vulkan/android/WindowSurfaceVkAndroid.h
>+)
>+
>+set(libangle_vulkan_win32_sources
>+    src/libANGLE/renderer/vulkan/win32/DisplayVkWin32.cpp
>+    src/libANGLE/renderer/vulkan/win32/DisplayVkWin32.h
>+    src/libANGLE/renderer/vulkan/win32/WindowSurfaceVkWin32.cpp
>+    src/libANGLE/renderer/vulkan/win32/WindowSurfaceVkWin32.h
>+)
>+
>+set(libangle_vulkan_xcb_sources
>+    src/libANGLE/renderer/vulkan/xcb/DisplayVkXcb.cpp
>+    src/libANGLE/renderer/vulkan/xcb/DisplayVkXcb.h
>+    src/libANGLE/renderer/vulkan/xcb/WindowSurfaceVkXcb.cpp
>+    src/libANGLE/renderer/vulkan/xcb/WindowSurfaceVkXcb.h
>+)
>+
>+set(libangle_vulkan_fuchsia_sources
>+    src/libANGLE/renderer/vulkan/fuchsia/DisplayVkFuchsia.cpp
>+    src/libANGLE/renderer/vulkan/fuchsia/DisplayVkFuchsia.h
>+    src/libANGLE/renderer/vulkan/fuchsia/WindowSurfaceVkFuchsia.cpp
>+    src/libANGLE/renderer/vulkan/fuchsia/WindowSurfaceVkFuchsia.h
>+)
>+
>+set(libangle_null_sources
>+    src/libANGLE/renderer/null/BufferNULL.cpp
>+    src/libANGLE/renderer/null/BufferNULL.h
>+    src/libANGLE/renderer/null/CompilerNULL.cpp
>+    src/libANGLE/renderer/null/CompilerNULL.h
>+    src/libANGLE/renderer/null/ContextNULL.cpp
>+    src/libANGLE/renderer/null/ContextNULL.h
>+    src/libANGLE/renderer/null/DeviceNULL.cpp
>+    src/libANGLE/renderer/null/DeviceNULL.h
>+    src/libANGLE/renderer/null/DisplayNULL.cpp
>+    src/libANGLE/renderer/null/DisplayNULL.h
>+    src/libANGLE/renderer/null/FenceNVNULL.cpp
>+    src/libANGLE/renderer/null/FenceNVNULL.h
>+    src/libANGLE/renderer/null/FramebufferNULL.cpp
>+    src/libANGLE/renderer/null/FramebufferNULL.h
>+    src/libANGLE/renderer/null/ImageNULL.cpp
>+    src/libANGLE/renderer/null/ImageNULL.h
>+    src/libANGLE/renderer/null/PathNULL.cpp
>+    src/libANGLE/renderer/null/PathNULL.h
>+    src/libANGLE/renderer/null/ProgramNULL.cpp
>+    src/libANGLE/renderer/null/ProgramNULL.h
>+    src/libANGLE/renderer/null/ProgramPipelineNULL.cpp
>+    src/libANGLE/renderer/null/ProgramPipelineNULL.h
>+    src/libANGLE/renderer/null/QueryNULL.cpp
>+    src/libANGLE/renderer/null/QueryNULL.h
>+    src/libANGLE/renderer/null/RenderbufferNULL.cpp
>+    src/libANGLE/renderer/null/RenderbufferNULL.h
>+    src/libANGLE/renderer/null/SamplerNULL.cpp
>+    src/libANGLE/renderer/null/SamplerNULL.h
>+    src/libANGLE/renderer/null/ShaderNULL.cpp
>+    src/libANGLE/renderer/null/ShaderNULL.h
>+    src/libANGLE/renderer/null/SurfaceNULL.cpp
>+    src/libANGLE/renderer/null/SurfaceNULL.h
>+    src/libANGLE/renderer/null/SyncNULL.cpp
>+    src/libANGLE/renderer/null/SyncNULL.h
>+    src/libANGLE/renderer/null/TextureNULL.cpp
>+    src/libANGLE/renderer/null/TextureNULL.h
>+    src/libANGLE/renderer/null/TransformFeedbackNULL.cpp
>+    src/libANGLE/renderer/null/TransformFeedbackNULL.h
>+    src/libANGLE/renderer/null/VertexArrayNULL.cpp
>+    src/libANGLE/renderer/null/VertexArrayNULL.h
>+)
>+
>+set(libglesv2_sources
>+    src/common/angleutils.h
>+    src/common/debug.h
>+    src/libGLESv2/entry_points_egl.cpp
>+    src/libGLESv2/entry_points_egl.h
>+    src/libGLESv2/entry_points_egl_ext.cpp
>+    src/libGLESv2/entry_points_egl_ext.h
>+    src/libGLESv2/entry_points_enum_autogen.h
>+    src/libGLESv2/entry_points_gles_1_0_autogen.cpp
>+    src/libGLESv2/entry_points_gles_1_0_autogen.h
>+    src/libGLESv2/entry_points_gles_2_0_autogen.cpp
>+    src/libGLESv2/entry_points_gles_2_0_autogen.h
>+    src/libGLESv2/entry_points_gles_3_0_autogen.cpp
>+    src/libGLESv2/entry_points_gles_3_0_autogen.h
>+    src/libGLESv2/entry_points_gles_3_1_autogen.cpp
>+    src/libGLESv2/entry_points_gles_3_1_autogen.h
>+    src/libGLESv2/entry_points_gles_ext_autogen.cpp
>+    src/libGLESv2/entry_points_gles_ext_autogen.h
>+    src/libGLESv2/entry_points_utils.h
>+    src/libGLESv2/global_state.cpp
>+    src/libGLESv2/global_state.h
>+    src/libGLESv2/libGLESv2_autogen.cpp
>+    src/libGLESv2/libGLESv2.rc
>+    src/libGLESv2/proc_table.h
>+    src/libGLESv2/proc_table_autogen.cpp
>+    src/libGLESv2/resource.h
>+)
>+
>+set(libglesv1_cm_sources
>+    src/libGLESv1_CM/libGLESv1_CM.cpp
>+    src/libGLESv1_CM/libGLESv1_CM.def
>+    src/libGLESv1_CM/libGLESv1_CM.rc
>+    src/libGLESv1_CM/resource.h
>+)
>+
>+set(libegl_sources
>+    src/libEGL/libEGL.cpp
>+    src/libEGL/libEGL.rc
>+    src/libEGL/resource.h
>+    src/libGLESv2/entry_points_egl.h
>+    src/libGLESv2/entry_points_egl_ext.h
>+    src/libEGL/egl_loader_autogen.h
>+)
>diff --git a/Source/ThirdParty/ANGLE/PlatformPlayStation.cmake b/Source/ThirdParty/ANGLE/PlatformPlayStation.cmake
>new file mode 100644
>index 00000000000..cfc5825ba58
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/PlatformPlayStation.cmake
>@@ -0,0 +1,2 @@
>+# Allow building ANGLE on platforms that don't provide X11 headers.
>+list(APPEND ANGLE_DEFINITIONS USE_SYSTEM_EGL)
>diff --git a/Source/ThirdParty/ANGLE/PlatformWPE.cmake b/Source/ThirdParty/ANGLE/PlatformWPE.cmake
>new file mode 100644
>index 00000000000..cfc5825ba58
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/PlatformWPE.cmake
>@@ -0,0 +1,2 @@
>+# Allow building ANGLE on platforms that don't provide X11 headers.
>+list(APPEND ANGLE_DEFINITIONS USE_SYSTEM_EGL)
>diff --git a/Source/ThirdParty/ANGLE/PlatformWin.cmake b/Source/ThirdParty/ANGLE/PlatformWin.cmake
>index 3dcbf6fe303..65dbbc73812 100644
>--- a/Source/ThirdParty/ANGLE/PlatformWin.cmake
>+++ b/Source/ThirdParty/ANGLE/PlatformWin.cmake
>@@ -1,147 +1,32 @@
>-if (${CMAKE_GENERATOR} MATCHES "Ninja")
>-    if (${MSVC_CXX_ARCHITECTURE_ID} STREQUAL "X86")
>-        link_directories(${WINDOWSSDKDIR}Lib/${WINDOWSSDKLIBVERSION}/um/x86)
>-    else ()
>-        link_directories(${WINDOWSSDKDIR}Lib/${WINDOWSSDKLIBVERSION}/um/x64)
>-    endif ()
>-else ()
>-    if (${MSVC_CXX_ARCHITECTURE_ID} STREQUAL "X86")
>-        link_directories($(WINDOWSSDKDIR)Lib/$(WINDOWSSDKLIBVERSION)/um/x86)
>-    else ()
>-        link_directories($(WINDOWSSDKDIR)Lib/$(WINDOWSSDKLIBVERSION)/um/x64)
>-    endif ()
>-endif ()
>+# We're targeting Windows 10 which will have DirectX 11 on it so require that
>+# but make DirectX 9 optional
> 
>-list(APPEND ANGLEEGL_SOURCES
>-    src/libEGL/libEGL.def
>-    src/libEGL/libEGL.rc
>+list(APPEND ANGLE_DEFINITIONS
>+    GL_APICALL=
>+    GL_API=
>+    NOMINMAX
> )
> 
>-list(APPEND ANGLEEGL_COMPILE_DEFINITIONS
>-    __STDC_CONSTANT_MACROS
>-)
>+if (USE_ANGLE_EGL)
>+    # We're targeting Windows 10 which will have DirectX 11
>+    list(APPEND ANGLE_SOURCES
>+        ${angle_system_utils_sources_win}
>+        ${angle_translator_hlsl_sources}
> 
>-list(APPEND ANGLEGLESv2_SOURCES
>-    src/libGLESv2/libGLESv2.def
>-    src/libGLESv2/libGLESv2.rc
>-)
>+        ${libangle_d3d_shared_sources}
>+        ${libangle_d3d11_sources}
>+        ${libangle_d3d11_win32_sources}
>+    )
> 
>-list(APPEND ANGLEGLESv2_COMPILE_DEFINITIONS
>-    __STDC_CONSTANT_MACROS
>-    __STDC_LIMIT_MACROS
>-)
>+    list(APPEND ANGLE_DEFINITIONS
>+        ANGLE_ENABLE_HLSL
>+        ANGLE_ENABLE_D3D11
>+    )
> 
>-list(APPEND ANGLEGLESv2_LIBRARIES
>-    D3d9
>-)
>+    list(APPEND ANGLEGLESv2_LIBRARIES dxguid)
> 
>-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/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
>-    src/libANGLE/renderer/d3d/d3d11/Context11.cpp
>-    src/libANGLE/renderer/d3d/d3d11/DebugAnnotator11.cpp
>-    src/libANGLE/renderer/d3d/d3d11/dxgi_format_map_autogen.cpp
>-    src/libANGLE/renderer/d3d/d3d11/dxgi_support_table.cpp
>-    src/libANGLE/renderer/d3d/d3d11/Fence11.cpp
>-    src/libANGLE/renderer/d3d/d3d11/formatutils11.cpp
>-    src/libANGLE/renderer/d3d/d3d11/Framebuffer11.cpp
>-    src/libANGLE/renderer/d3d/d3d11/Image11.cpp
>-    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.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/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/d3d9/Blit9.cpp
>-    src/libANGLE/renderer/d3d/d3d9/Buffer9.cpp
>-    src/libANGLE/renderer/d3d/d3d9/Context9.cpp
>-    src/libANGLE/renderer/d3d/d3d9/DebugAnnotator9.cpp
>-    src/libANGLE/renderer/d3d/d3d9/Fence9.cpp
>-    src/libANGLE/renderer/d3d/d3d9/formatutils9.cpp
>-    src/libANGLE/renderer/d3d/d3d9/Framebuffer9.cpp
>-    src/libANGLE/renderer/d3d/d3d9/Image9.cpp
>-    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.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
>-    src/libANGLE/renderer/d3d/d3d9/SwapChain9.cpp
>-    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/d3d11/win32/NativeWindow11Win32.cpp
>-    src/third_party/systeminfo/SystemInfo.cpp
>-)
>-
>-list(APPEND ANGLE_COMPILE_DEFINITIONS
>-    ANGLE_DEFAULT_D3D11=1
>-    ANGLE_ENABLE_D3D9
>-    ANGLE_ENABLE_D3D11
>-    ANGLE_ENABLE_HLSL
>-    ANGLE_SKIP_DXGI_1_2_CHECK=1
>-    __STDC_CONSTANT_MACROS
>-    __STDC_LIMIT_MACROS
>-)
>+    # DirectX 9 support should be optional but ANGLE will not compile without it
>+    list(APPEND ANGLE_SOURCES ${libangle_d3d9_sources})
>+    list(APPEND ANGLE_DEFINITIONS ANGLE_ENABLE_D3D9)
>+    list(APPEND ANGLEGLESv2_LIBRARIES d3d9)
>+endif ()
>diff --git a/Source/ThirdParty/ANGLE/include/CMakeLists.txt b/Source/ThirdParty/ANGLE/include/CMakeLists.txt
>new file mode 100644
>index 00000000000..f84eec751ab
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/include/CMakeLists.txt
>@@ -0,0 +1,62 @@
>+set(egl_headers
>+    EGL/egl.h
>+    EGL/eglext.h
>+    EGL/eglext_angle.h
>+    EGL/eglplatform.h
>+)
>+
>+set(gles_headers
>+    GLES/egl.h
>+    GLES/gl.h
>+    GLES/glext.h
>+    GLES/glext_explicit_context_autogen.inc
>+    GLES/glext_angle.h
>+    GLES/glplatform.h
>+)
>+
>+set(gles2_headers
>+    GLES2/gl2.h
>+    GLES2/gl2ext.h
>+    GLES2/gl2ext_explicit_context_autogen.inc
>+    GLES2/gl2ext_angle.h
>+    GLES2/gl2platform.h
>+)
>+
>+set(gles3_headers
>+    GLES3/gl3.h
>+    GLES3/gl3ext_explicit_context_autogen.inc
>+    GLES3/gl31.h
>+    GLES3/gl31ext_explicit_context_autogen.inc
>+    GLES3/gl32.h
>+    GLES3/gl3platform.h
>+)
>+
>+set(glslang_headers
>+    GLSLANG/ShaderLang.h
>+    GLSLANG/ShaderVars.h
>+)
>+
>+set(khr_headers KHR/khrplatform.h)
>+
>+set(ANGLE_PUBLIC_HEADERS ${khr_headers})
>+
>+if (USE_ANGLE_EGL)
>+    list(APPEND ANGLE_PUBLIC_HEADERS
>+        ${egl_headers}
>+        ${gles_headers}
>+        ${gles2_headers}
>+        ${gles3_headers}
>+    )
>+endif ()
>+
>+# Cocoa expects headers in an ANGLE directory
>+WEBKIT_COPY_FILES(GLSLANGHeaders
>+    DESTINATION ${ANGLE_FRAMEWORK_HEADERS_DIR}/ANGLE
>+    FILES ${glslang_headers}
>+    FLATTENED
>+)
>+
>+WEBKIT_COPY_FILES(ANGLEHeaders
>+    DESTINATION ${ANGLE_FRAMEWORK_HEADERS_DIR}
>+    FILES ${ANGLE_PUBLIC_HEADERS}
>+)
>diff --git a/Source/ThirdParty/ANGLE/src/id/commit.h b/Source/ThirdParty/ANGLE/src/id/commit.h
>new file mode 100644
>index 00000000000..4c89a657c5e
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/id/commit.h
>@@ -0,0 +1,14 @@
>+//
>+// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// commit.h:
>+//   This is a default commit hash header, when git is not available.
>+//
>+
>+#define ANGLE_COMMIT_HASH "unknown hash"
>+#define ANGLE_COMMIT_HASH_SIZE 12
>+#define ANGLE_COMMIT_DATE "unknown date"
>+
>+#define ANGLE_DISABLE_PROGRAM_BINARY_LOAD
>diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
>index e06abb5d75b..e0fb489dc68 100644
>--- a/Source/WebCore/CMakeLists.txt
>+++ b/Source/WebCore/CMakeLists.txt
>@@ -1137,12 +1137,6 @@ set(WebCore_SVG_IDL_FILES
>     svg/SVGZoomEvent.idl
> )
> 
>-if (WIN32 AND INTERNAL_BUILD)
>-    set(ANGLE_FORWARDING_HEADERS_DIR "${CMAKE_BINARY_DIR}/../include/private/ANGLE")
>-else ()
>-    set(ANGLE_FORWARDING_HEADERS_DIR "${FORWARDING_HEADERS_DIR}/ANGLE")
>-endif ()
>-
> if (ENABLE_GAMEPAD)
>     list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>         "${WEBCORE_DIR}/Modules/gamepad"
>@@ -1210,6 +1204,10 @@ set(WebCore_LIBRARIES
>     PAL${DEBUG_SUFFIX}
> )
> 
>+set(WebCoreTestSupport_LIBRARIES
>+    JavaScriptCore${DEBUG_SUFFIX}
>+)
>+
> if (ENABLE_LEGACY_ENCRYPTED_MEDIA)
>     list(APPEND WebCore_SOURCES
>         Modules/encryptedmedia/legacy/LegacyCDM.cpp
>@@ -1448,6 +1446,15 @@ if (ENABLE_QUOTA)
> endif ()
> 
> if (ENABLE_GRAPHICS_CONTEXT_3D)
>+    list(APPEND WebCore_SOURCES
>+        platform/graphics/ANGLEWebKitBridge.cpp
>+        platform/graphics/FormatConverter.cpp
>+        platform/graphics/GraphicsContext3D.cpp
>+    )
>+
>+    list(APPEND WebCore_LIBRARIES ANGLEFramework)
>+    list(APPEND WebCoreTestSupport_LIBRARIES ANGLEFramework)
>+
>     # For platforms that want to use system-provided OpenGL (ES) / EGL headers,
>     # these include directories, libraries or definitions need to be
>     # added before the ANGLE directories.
>@@ -1490,150 +1497,8 @@ if (ENABLE_GRAPHICS_CONTEXT_3D)
>     endif ()
> 
>     list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>-        "${ANGLE_FORWARDING_HEADERS_DIR}"
>         "${WEBCORE_DIR}/platform/graphics/gpu"
>     )
>-
>-    list(APPEND ANGLESupport_SOURCES
>-        ${THIRDPARTY_DIR}/ANGLE/src/common/angleutils.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/common/debug.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/common/event_tracer.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/common/Float16ToFloat32.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/common/mathutil.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/common/MemoryBuffer.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/common/string_utils.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/common/third_party/smhasher/src/PMurHash.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/common/tls.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/common/uniform_type_info_autogen.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/common/utilities.cpp
>-
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/preprocessor/DiagnosticsBase.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/preprocessor/DirectiveHandlerBase.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/preprocessor/DirectiveParser.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/preprocessor/Input.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/preprocessor/Lexer.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/preprocessor/Macro.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/preprocessor/MacroExpander.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/preprocessor/Preprocessor.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/preprocessor/Token.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/preprocessor/Tokenizer.cpp
>-
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ASTMetadataHLSL.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/AddAndTrueToLoopCondition.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/AddDefaultReturnStatements.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ArrayReturnValueToOutParameter.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/BreakVariableAliasingInInnerLoops.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/BuiltInFunctionEmulator.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/BuiltInFunctionEmulatorGLSL.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/BuiltInFunctionEmulatorHLSL.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/Cache.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/CallDAG.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ClampPointSize.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/CodeGen.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/CollectVariables.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/Compiler.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ConstantUnion.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/DeclareAndInitBuiltinsForInstancedMultiview.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/DeferGlobalInitializers.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/Diagnostics.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/DirectiveHandler.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/EmulateGLFragColorBroadcast.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/EmulatePrecision.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ExpandIntegerPowExpressions.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ExtensionBehavior.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ExtensionGLSL.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/FindMain.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/FindSymbolNode.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/FlagStd140Structs.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/HashNames.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ImageFunctionHLSL.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/InfoSink.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/Initialize.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/InitializeDll.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/InitializeVariables.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/IntermNode.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/IntermNodePatternMatcher.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/IntermNode_util.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/IntermTraverse.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/IsASTDepthBelowLimit.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/Operator.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/OutputESSL.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/OutputGLSL.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/OutputGLSLBase.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/OutputHLSL.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/OutputTree.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/OutputVulkanGLSL.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ParseContext.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/PoolAlloc.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/PruneNoOps.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/QualifierTypes.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RecordConstantPrecision.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RegenerateStructNames.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RemoveArrayLengthMethod.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RemoveDynamicIndexing.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RemoveEmptySwitchStatements.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RemoveInvariantDeclaration.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RemoveNoOpCasesFromEndOfSwitchStatements.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RemovePow.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RemoveSwitchFallThrough.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RemoveUnreferencedVariables.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RewriteDoWhile.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RewriteElseBlocks.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RewriteTexelFetchOffset.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RewriteUnaryMinusOperatorFloat.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RewriteUnaryMinusOperatorInt.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RunAtTheEndOfShader.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ScalarizeVecAndMatConstructorArgs.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/SearchSymbol.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/SeparateArrayInitialization.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/SeparateDeclarations.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/SeparateExpressionsReturningArrays.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ShaderLang.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ShaderVars.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/SimplifyLoopConditions.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/SplitSequenceOperator.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/StructureHLSL.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/SymbolTable.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/SymbolUniqueId.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/TextureFunctionHLSL.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/TranslatorESSL.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/TranslatorGLSL.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/TranslatorHLSL.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/TranslatorVulkan.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/Types.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/UnfoldShortCircuitAST.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/UnfoldShortCircuitToIf.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/UniformHLSL.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/UseInterfaceBlockFields.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/UtilsHLSL.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ValidateGlobalInitializer.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ValidateLimitations.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ValidateMaxParameters.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ValidateOutputs.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ValidateSwitch.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ValidateVaryingLocations.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/VariablePacker.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/VectorizeVectorScalarArithmetic.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/VersionGLSL.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/WrapSwitchStatementsInBlocks.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/blocklayout.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/blocklayoutHLSL.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/emulated_builtin_functions_hlsl_autogen.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/glslang_lex.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/glslang_tab.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/util.cpp
>-
>-        ${THIRDPARTY_DIR}/ANGLE/src/third_party/compiler/ArrayBoundsClamper.cpp
>-
>-        ${THIRDPARTY_DIR}/ANGLE/src/libANGLE/Platform.cpp
>-    )
>-
>-    list(APPEND WebCore_SOURCES
>-        platform/graphics/ANGLEWebKitBridge.cpp
>-        platform/graphics/FormatConverter.cpp
>-        platform/graphics/GraphicsContext3D.cpp
>-    )
> endif ()
> 
> if (ENABLE_USER_MESSAGE_HANDLERS)
>@@ -1732,10 +1597,6 @@ list(APPEND WebCoreTestSupport_SOURCES
>     testing/js/WebCoreTestSupport.cpp
> )
> 
>-set(WebCoreTestSupport_LIBRARIES
>-    PRIVATE JavaScriptCore${DEBUG_SUFFIX}
>-)
>-
> # Modules that the bindings generator scripts may use
> set(SCRIPTS_RESOLVE_SUPPLEMENTAL
>     ${WEBCORE_DIR}/bindings/scripts/IDLParser.pm
>@@ -2121,36 +1982,6 @@ if (WebCoreTestSupport_OUTPUT_NAME)
>     endif ()
> endif ()
> 
>-if (ENABLE_GRAPHICS_CONTEXT_3D AND NOT WIN32)
>-    add_library(ANGLESupport STATIC ${ANGLESupport_SOURCES})
>-
>-    # Enable the ESSL and GLSL translators.
>-    set_property(TARGET ANGLESupport
>-        PROPERTY COMPILE_DEFINITIONS
>-        ANGLE_ENABLE_ESSL
>-        ANGLE_ENABLE_GLSL
>-        ${ANGLE_PLATFORM_DEFINITIONS})
>-
>-    target_include_directories(ANGLESupport PRIVATE
>-        "${THIRDPARTY_DIR}/ANGLE"
>-        "${THIRDPARTY_DIR}/ANGLE/include"
>-        "${THIRDPARTY_DIR}/ANGLE/include/KHR"
>-        "${THIRDPARTY_DIR}/ANGLE/src"
>-        "${THIRDPARTY_DIR}/ANGLE/src/common/third_party/base"
>-    )
>-    target_link_libraries(WebCore ANGLESupport)
>-
>-    if (COMPILER_IS_GCC_OR_CLANG)
>-        WEBKIT_ADD_TARGET_CXX_FLAGS(ANGLESupport -Wno-implicit-fallthrough
>-                                                 -Wno-inconsistent-missing-override
>-                                                 -Wno-null-conversion
>-                                                 -Wno-suggest-attribute=format
>-                                                 -Wno-unused-function
>-                                                 -Wno-unused-parameter)
>-    endif ()
>-endif ()
>-
>-
> if (${WebCore_LIBRARY_TYPE} MATCHES "SHARED")
>     set_target_properties(WebCore PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
>     install(TARGETS WebCore DESTINATION "${LIB_INSTALL_DIR}")
>diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake
>index b9682cfa0e0..856a005226d 100644
>--- a/Source/WebCore/PlatformGTK.cmake
>+++ b/Source/WebCore/PlatformGTK.cmake
>@@ -15,8 +15,6 @@ list(APPEND WebCore_UNIFIED_SOURCE_LIST_FILES
> )
> 
> list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>-    "${THIRDPARTY_DIR}/ANGLE/"
>-    "${THIRDPARTY_DIR}/ANGLE/include/KHR"
>     "${WEBCORE_DIR}/accessibility/atk"
>     "${WEBCORE_DIR}/editing/atk"
>     "${WEBCORE_DIR}/page/gtk"
>diff --git a/Source/WebCore/PlatformMac.cmake b/Source/WebCore/PlatformMac.cmake
>index d7012814275..dec34334a0f 100644
>--- a/Source/WebCore/PlatformMac.cmake
>+++ b/Source/WebCore/PlatformMac.cmake
>@@ -71,9 +71,6 @@ if (NOT LOOKUP_FRAMEWORK-NOTFOUND)
> endif ()
> 
> list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>-    "${CMAKE_SOURCE_DIR}/Source"
>-    "${THIRDPARTY_DIR}/ANGLE"
>-    "${THIRDPARTY_DIR}/ANGLE/include/KHR"
>     "${WEBCORE_DIR}/accessibility/mac"
>     "${WEBCORE_DIR}/bridge/objc"
>     "${WEBCORE_DIR}/editing/cocoa"
>diff --git a/Source/WebCore/PlatformPlayStation.cmake b/Source/WebCore/PlatformPlayStation.cmake
>index 84edc2616b3..d1ea46ce800 100644
>--- a/Source/WebCore/PlatformPlayStation.cmake
>+++ b/Source/WebCore/PlatformPlayStation.cmake
>@@ -5,8 +5,6 @@ include(platform/ImageDecoders.cmake)
> include(platform/TextureMapper.cmake)
> 
> list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>-    ${THIRDPARTY_DIR}/ANGLE/
>-    ${THIRDPARTY_DIR}/ANGLE/include/KHR
>     ${WEBCORE_DIR}/platform
>     ${WEBCORE_DIR}/platform/generic
>     ${WEBCORE_DIR}/platform/graphics/egl
>diff --git a/Source/WebCore/PlatformWPE.cmake b/Source/WebCore/PlatformWPE.cmake
>index 3bd9a067bcb..1cad0e617fb 100644
>--- a/Source/WebCore/PlatformWPE.cmake
>+++ b/Source/WebCore/PlatformWPE.cmake
>@@ -16,12 +16,7 @@ list(APPEND WebCore_UNIFIED_SOURCE_LIST_FILES
>     "platform/SourcesGLib.txt"
> )
> 
>-# Allow building ANGLE on platforms that don't provide X11 headers.
>-list(APPEND ANGLE_PLATFORM_DEFINITIONS "USE_WPE")
>-
> list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>-    "${THIRDPARTY_DIR}/ANGLE/"
>-    "${THIRDPARTY_DIR}/ANGLE/include/KHR"
>     "${WEBCORE_DIR}/platform/graphics/egl"
>     "${WEBCORE_DIR}/platform/graphics/epoxy"
>     "${WEBCORE_DIR}/platform/graphics/glx"
>diff --git a/Source/WebCore/PlatformWin.cmake b/Source/WebCore/PlatformWin.cmake
>index bdc70cd2b0e..eaf009f7b02 100644
>--- a/Source/WebCore/PlatformWin.cmake
>+++ b/Source/WebCore/PlatformWin.cmake
>@@ -14,11 +14,8 @@ list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>     "${WEBCORE_DIR}/platform/win"
> )
> 
>-# FIXME: ANGLE should put its headers into a single directory
> list(APPEND WebCore_INCLUDE_DIRECTORIES
>     "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
>-    "${THIRDPARTY_DIR}/ANGLE/include"
>-    "${THIRDPARTY_DIR}/ANGLE/include/egl"
> )
> 
> list(APPEND WebCore_SOURCES
>@@ -244,7 +241,4 @@ set(WebCore_OUTPUT_NAME
> )
> 
> list(APPEND WebCore_LIBRARIES WTF${DEBUG_SUFFIX})
>-if (TARGET libEGL)
>-    list(APPEND WebCore_LIBRARIES libEGL)
>-endif ()
> list(APPEND WebCoreTestSupport_LIBRARIES WTF${DEBUG_SUFFIX})
>diff --git a/Source/WebCore/platform/graphics/GLContext.cpp b/Source/WebCore/platform/graphics/GLContext.cpp
>index 0db199cd41c..5d0b5ed428f 100644
>--- a/Source/WebCore/platform/graphics/GLContext.cpp
>+++ b/Source/WebCore/platform/graphics/GLContext.cpp
>@@ -29,7 +29,6 @@
> #if USE(LIBEPOXY)
> #include <epoxy/gl.h>
> #elif USE(OPENGL_ES)
>-#define GL_GLEXT_PROTOTYPES 1
> #include <GLES2/gl2.h>
> #endif
> 
>diff --git a/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp b/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp
>index 732137c6b9c..d6ff3790a37 100644
>--- a/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp
>+++ b/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp
>@@ -38,7 +38,6 @@
> #if USE(LIBEPOXY)
> #include <epoxy/gl.h>
> #elif USE(OPENGL_ES)
>-#define GL_GLEXT_PROTOTYPES 1
> #include <GLES2/gl2.h>
> #include <GLES2/gl2ext.h>
> #else
>diff --git a/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp b/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp
>index d3f00e600be..bf91e72457a 100644
>--- a/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp
>+++ b/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp
>@@ -50,7 +50,6 @@
> #include "EpoxyShims.h"
> #elif USE(OPENGL_ES)
> #include "OpenGLESShims.h"
>-#define GL_GLEXT_PROTOTYPES 1
> #include <GLES2/gl2.h>
> #include <GLES2/gl2ext.h>
> #elif PLATFORM(GTK) || PLATFORM(WIN)
>diff --git a/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h b/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h
>index d01e3b2930f..f56222f2089 100644
>--- a/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h
>+++ b/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h
>@@ -33,7 +33,6 @@
> #if USE(LIBEPOXY)
> #include <epoxy/gl.h>
> #else
>-#define GL_GLEXT_PROTOTYPES 1
> #include <GLES2/gl2.h>
> #include <GLES2/gl2ext.h>
> #endif
>diff --git a/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp b/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp
>index 14d42862bf2..0da2599b5ac 100644
>--- a/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp
>+++ b/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp
>@@ -37,11 +37,7 @@
> #include "IntSize.h"
> #include "NotImplemented.h"
> 
>-#if PLATFORM(WIN)
>-#include <GLSLANG/ShaderLang.h>
>-#else
> #include <ANGLE/ShaderLang.h>
>-#endif
> 
> namespace WebCore {
> 
>diff --git a/Source/WebCore/platform/graphics/opengl/TemporaryOpenGLSetting.cpp b/Source/WebCore/platform/graphics/opengl/TemporaryOpenGLSetting.cpp
>index f2ea7130009..2ffa6b77673 100644
>--- a/Source/WebCore/platform/graphics/opengl/TemporaryOpenGLSetting.cpp
>+++ b/Source/WebCore/platform/graphics/opengl/TemporaryOpenGLSetting.cpp
>@@ -41,7 +41,6 @@
> #endif
> 
> #elif USE(OPENGL_ES)
>-#define GL_GLEXT_PROTOTYPES 1
> #include <GLES2/gl2.h>
> #include "OpenGLESShims.h"
> 
>diff --git a/Source/WebCore/platform/graphics/texmap/GraphicsContext3DTextureMapper.cpp b/Source/WebCore/platform/graphics/texmap/GraphicsContext3DTextureMapper.cpp
>index 652c90fdb01..6fbab0b462d 100644
>--- a/Source/WebCore/platform/graphics/texmap/GraphicsContext3DTextureMapper.cpp
>+++ b/Source/WebCore/platform/graphics/texmap/GraphicsContext3DTextureMapper.cpp
>@@ -35,11 +35,7 @@
> #include <wtf/Deque.h>
> #include <wtf/NeverDestroyed.h>
> 
>-#if PLATFORM(WIN)
>-#include <GLSLANG/ShaderLang.h>
>-#else
> #include <ANGLE/ShaderLang.h>
>-#endif
> 
> #if USE(LIBEPOXY)
> #include <epoxy/gl.h>
>diff --git a/Source/WebCore/platform/graphics/texmap/TextureMapperGLHeaders.h b/Source/WebCore/platform/graphics/texmap/TextureMapperGLHeaders.h
>index 53e2069e0a0..fdd25425859 100644
>--- a/Source/WebCore/platform/graphics/texmap/TextureMapperGLHeaders.h
>+++ b/Source/WebCore/platform/graphics/texmap/TextureMapperGLHeaders.h
>@@ -28,7 +28,6 @@
> #if USE(LIBEPOXY)
> #include <epoxy/gl.h>
> #elif USE(OPENGL_ES)
>-#define GL_GLEXT_PROTOTYPES 1
> #include <GLES2/gl2.h>
> #else
> #include "OpenGLShims.h"
>diff --git a/Source/WebKit/CMakeLists.txt b/Source/WebKit/CMakeLists.txt
>index ce4f200b5fc..4b0bec7cb80 100644
>--- a/Source/WebKit/CMakeLists.txt
>+++ b/Source/WebKit/CMakeLists.txt
>@@ -272,11 +272,6 @@ if (ENABLE_GRAPHICS_CONTEXT_3D)
>             add_definitions(${EGL_DEFINITIONS})
>         endif ()
>     endif ()
>-
>-    list(APPEND WebKit_INCLUDE_DIRECTORIES
>-        "${THIRDPARTY_DIR}/ANGLE"
>-        "${THIRDPARTY_DIR}/ANGLE/include/KHR"
>-    )
> endif ()
> 
> if (ATOMIC_INT64_REQUIRES_LIBATOMIC)
>diff --git a/Source/WebKitLegacy/PlatformWin.cmake b/Source/WebKitLegacy/PlatformWin.cmake
>index 3506b154db7..7408928bf18 100644
>--- a/Source/WebKitLegacy/PlatformWin.cmake
>+++ b/Source/WebKitLegacy/PlatformWin.cmake
>@@ -52,10 +52,6 @@ list(APPEND WebKitLegacy_PRIVATE_INCLUDE_DIRECTORIES
>     "${WEBKITLEGACY_DIR}/win/WebCoreSupport"
>     "${WebKitLegacy_DERIVED_SOURCES_DIR}/include"
>     "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces"
>-    "${FORWARDING_HEADERS_DIR}/ANGLE"
>-    "${FORWARDING_HEADERS_DIR}/ANGLE/include"
>-    "${FORWARDING_HEADERS_DIR}/ANGLE/include/egl"
>-    "${FORWARDING_HEADERS_DIR}/ANGLE/include/khr"
> )
> 
> list(APPEND WebKitLegacy_INCLUDES
>@@ -452,14 +448,6 @@ list(APPEND WebKitLegacy_LIBRARIES
>     PRIVATE WindowsCodecs
> )
> 
>-if (ENABLE_GRAPHICS_CONTEXT_3D)
>-    list(APPEND WebKitLegacy_LIBRARIES
>-        libANGLE${DEBUG_SUFFIX}
>-        libEGL${DEBUG_SUFFIX}
>-        libGLESv2${DEBUG_SUFFIX}
>-    )
>-endif ()
>-
> set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")
> set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")
> 
>diff --git a/Source/WebKitLegacy/win/WebCoreSupport/AcceleratedCompositingContext.cpp b/Source/WebKitLegacy/win/WebCoreSupport/AcceleratedCompositingContext.cpp
>index ae47e305876..e447370d9d1 100644
>--- a/Source/WebKitLegacy/win/WebCoreSupport/AcceleratedCompositingContext.cpp
>+++ b/Source/WebKitLegacy/win/WebCoreSupport/AcceleratedCompositingContext.cpp
>@@ -43,7 +43,6 @@
> #include <WebCore/TextureMapperLayer.h>
> 
> #if USE(OPENGL_ES)
>-#define GL_GLEXT_PROTOTYPES 1
> #include <GLES2/gl2.h>
> #else
> #include <GL/gl.h>
>diff --git a/Source/cmake/OptionsWinCairo.cmake b/Source/cmake/OptionsWinCairo.cmake
>index 2458e7e37af..a716ec6f0ea 100644
>--- a/Source/cmake/OptionsWinCairo.cmake
>+++ b/Source/cmake/OptionsWinCairo.cmake
>@@ -33,6 +33,8 @@ SET_AND_EXPOSE_TO_BUILD(USE_INSPECTOR_SOCKET_SERVER ENABLE_REMOTE_INSPECTOR)
> set(ENABLE_GRAPHICS_CONTEXT_3D ON)
> set(ENABLE_WEBKIT ON)
> 
>+set(USE_ANGLE_EGL ON)
>+
> set(COREFOUNDATION_LIBRARY CFlite)
> 
> SET_AND_EXPOSE_TO_BUILD(ENABLE_DEVELOPER_MODE ${DEVELOPER_MODE})
>@@ -40,6 +42,7 @@ SET_AND_EXPOSE_TO_BUILD(ENABLE_DEVELOPER_MODE ${DEVELOPER_MODE})
> add_definitions(-DWTF_PLATFORM_WIN_CAIRO=1)
> 
> # Override headers directories
>+set(ANGLE_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/ANGLE/Headers)
> set(WTF_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/WTF/Headers)
> set(JavaScriptCore_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/JavaScriptCore/Headers)
> set(JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/JavaScriptCore/PrivateHeaders)
>diff --git a/Source/cmake/WebKitFS.cmake b/Source/cmake/WebKitFS.cmake
>index b182e1a18d6..b4918c1e107 100644
>--- a/Source/cmake/WebKitFS.cmake
>+++ b/Source/cmake/WebKitFS.cmake
>@@ -50,6 +50,7 @@ set(WebInspectorUI_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebIn
> 
> set(FORWARDING_HEADERS_DIR ${DERIVED_SOURCES_DIR}/ForwardingHeaders)
> 
>+set(ANGLE_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
> set(WTF_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
> set(JavaScriptCore_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
> set(JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
>diff --git a/Tools/TestWebKitAPI/PlatformWin.cmake b/Tools/TestWebKitAPI/PlatformWin.cmake
>index 931fa2b92d9..651ea158487 100644
>--- a/Tools/TestWebKitAPI/PlatformWin.cmake
>+++ b/Tools/TestWebKitAPI/PlatformWin.cmake
>@@ -57,7 +57,6 @@ if (${WTF_PLATFORM_WIN_CAIRO})
>     list(APPEND TestWebCore_LIBRARIES
>         ${CAIRO_LIBRARIES}
>         ${OPENSSL_LIBRARIES}
>-        libANGLE
>         mfuuid
>         strmiids
>         vcruntime

Flags:

ews-watchlist: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 197676: 369333 | 369336 | 369351 | 369365 | 369395 | 369406 | 369454 | 369510