Source/ThirdParty/ANGLE/ChangeLog

 12016-12-14 Alex Christensen <achristensen@webkit.org>
 2
 3 Progress towards using ANGLE to do WebGL rendering
 4 https://bugs.webkit.org/show_bug.cgi?id=165864
 5
 6 Reviewed by NOBODY (OOPS!).
 7
 8 * ANGLE.xcodeproj/project.pbxproj:
 9 Compile more files, and add some more "public" headers.
 10 ANGLE is not a public framework, so these headers just go in
 11 WebKitBuild/Release/usr/local/include/ANGLE to be included when compiling WebCore.
 12 * ANGLE/egl.h: Added.
 13 * ANGLE/eglext.h: Added.
 14 * ANGLE/eglplatform.h: Added.
 15 * ANGLE/entry_points_gles_2_0.h: Added.
 16 * ANGLE/entry_points_gles_2_0_ext.h: Added.
 17 * ANGLE/entry_points_gles_3_0.h: Added.
 18 * ANGLE/export.h: Added.
 19 * ANGLE/gl2.h: Added.
 20 * ANGLE/gl2ext.h: Added.
 21 * ANGLE/gl2platform.h: Added.
 22 * ANGLE/gl3.h: Added.
 23 * ANGLE/gl31.h: Added.
 24 * ANGLE/gl3platform.h: Added.
 25 * ANGLE/khrplatform.h: Added.
 26 Add more forwarding headers. There are already a few, but we need more.
 27 * CMakeLists.txt:
 28 * PlatformMac.cmake:
 29 Make the frameworks linked to by ANGLE be private so frameworks that link with
 30 ANGLE don't automatically link with them. This allows me to switch ANGLE from a
 31 static library to a dynamic library to make sure WebCore isn't directly using OpenGL.
 32 * PlatformWin.cmake:
 33 Move HLSL-specific files to only be built on Windows.
 34 * include/EGL/egl.h:
 35 * include/EGL/eglplatform.h:
 36 * include/GLES2/gl2.h:
 37 * include/GLES2/gl2platform.h:
 38 * include/GLES3/gl3.h:
 39 * include/GLES3/gl31.h:
 40 * include/GLES3/gl32.h:
 41 * include/GLES3/gl3platform.h:
 42 * src/libGLESv2/entry_points_egl.h:
 43 * src/libGLESv2/entry_points_egl_ext.h:
 44 * src/libGLESv2/entry_points_gles_2_0.h:
 45 * src/libGLESv2/entry_points_gles_2_0_ext.h:
 46 * src/libGLESv2/entry_points_gles_3_0.h:
 47 * src/libGLESv2/entry_points_gles_3_1.h:
 48 Include ANGLE headers as #include <ANGLE/*> instead of #include <KHR/*> or #include <GLES/*>
 49 This is needed to distinguish the ANGLE headers from any system OpenGL/OpenGLES headers.
 50 We will eventually only include ANGLE's entry_points_*.h directly from WebCore.
 51
1522016-12-07 Alex Christensen <achristensen@webkit.org>
253
354 Build more of ANGLE on Mac and Windows
209826

Source/ThirdParty/ANGLE/CMakeLists.txt

11include_directories(
 2 .
23 src
34 src/common/third_party/numerics
45 include

@@set(ANGLE_SOURCES
6162 src/compiler/translator/BreakVariableAliasingInInnerLoops.cpp
6263 src/compiler/translator/BuiltInFunctionEmulator.cpp
6364 src/compiler/translator/BuiltInFunctionEmulatorGLSL.cpp
64  src/compiler/translator/BuiltInFunctionEmulatorHLSL.cpp
6565 src/compiler/translator/Cache.cpp
6666 src/compiler/translator/CallDAG.cpp
6767 src/compiler/translator/CodeGen.cpp

@@set(ANGLE_SOURCES
9393 src/compiler/translator/OutputESSL.cpp
9494 src/compiler/translator/OutputGLSL.cpp
9595 src/compiler/translator/OutputGLSLBase.cpp
96  src/compiler/translator/OutputHLSL.cpp
9796 src/compiler/translator/ParseContext.cpp
9897 src/compiler/translator/PoolAlloc.cpp
9998 src/compiler/translator/PruneEmptyDeclarations.cpp

@@set(ANGLE_SOURCES
111110 src/compiler/translator/SearchSymbol.cpp
112111 src/compiler/translator/SearchSymbol.cpp
113112 src/compiler/translator/SearchSymbol.cpp
114  src/compiler/translator/SeparateArrayInitialization.cpp
115113 src/compiler/translator/SeparateDeclarations.cpp
116114 src/compiler/translator/SeparateExpressionsReturningArrays.cpp
117115 src/compiler/translator/ShaderLang.cpp
118116 src/compiler/translator/ShaderVars.cpp
119117 src/compiler/translator/SimplifyLoopConditions.cpp
120118 src/compiler/translator/SplitSequenceOperator.cpp
121  src/compiler/translator/StructureHLSL.cpp
122119 src/compiler/translator/SymbolTable.cpp
123  src/compiler/translator/TextureFunctionHLSL.cpp
124120 src/compiler/translator/TranslatorESSL.cpp
125121 src/compiler/translator/TranslatorGLSL.cpp
126  src/compiler/translator/TranslatorHLSL.cpp
127122 src/compiler/translator/Types.cpp
128123 src/compiler/translator/UnfoldShortCircuitAST.cpp
129124 src/compiler/translator/UnfoldShortCircuitToIf.cpp
130  src/compiler/translator/UniformHLSL.cpp
131125 src/compiler/translator/UseInterfaceBlockFields.cpp
132126 src/compiler/translator/util.cpp
133  src/compiler/translator/UtilsHLSL.cpp
134127 src/compiler/translator/ValidateGlobalInitializer.cpp
135128 src/compiler/translator/ValidateLimitations.cpp
136129 src/compiler/translator/ValidateMaxParameters.cpp
209782

Source/ThirdParty/ANGLE/PlatformMac.cmake

@@find_library(COREGRAPHICS_LIBRARY CoreGr
88find_library(OPENGL_LIBRARY OpenGL)
99find_library(QUARTZCORE_LIBRARY QuartzCore)
1010list(APPEND ANGLEGLESv2_LIBRARIES
11  ${COREGRAPHICS_LIBRARY}
12  ${OPENGL_LIBRARY}
13  ${QUARTZCORE_LIBRARY}
 11 PRIVATE ${COREGRAPHICS_LIBRARY}
 12 PRIVATE ${OPENGL_LIBRARY}
 13 PRIVATE ${QUARTZCORE_LIBRARY}
1414)
209782

Source/ThirdParty/ANGLE/PlatformWin.cmake

@@list(APPEND ANGLEGLESv2_LIBRARIES
3939
4040list(APPEND ANGLE_SOURCES
4141 src/compiler/translator/ASTMetadataHLSL.cpp
 42 src/compiler/translator/BuiltInFunctionEmulatorHLSL.cpp
 43 src/compiler/translator/OutputHLSL.cpp
 44 src/compiler/translator/SeparateArrayInitialization.cpp
 45 src/compiler/translator/StructureHLSL.cpp
 46 src/compiler/translator/TextureFunctionHLSL.cpp
 47 src/compiler/translator/TranslatorHLSL.cpp
 48 src/compiler/translator/UniformHLSL.cpp
4249 src/compiler/translator/blocklayoutHLSL.cpp
4350 src/libANGLE/renderer/d3d/BufferD3D.cpp
4451 src/libANGLE/renderer/d3d/CompilerD3D.cpp
209782

Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj

8383 31012E8018B97B9B0039062F /* VersionGLSL.h in Headers */ = {isa = PBXBuildFile; fileRef = 31012E1118B97B9B0039062F /* VersionGLSL.h */; };
8484 312BDB0C15FECAC90097EBC7 /* ANGLE.plist in CopyFiles */ = {isa = PBXBuildFile; fileRef = 312BDB0915FEC91E0097EBC7 /* ANGLE.plist */; };
8585 312BDB0E15FECAE50097EBC7 /* ANGLE.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 312BDB0A15FECA3A0097EBC7 /* ANGLE.txt */; };
 86 5C1BAA9A1DFB60FF002906BB /* gl3.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1BAA961DFB60FF002906BB /* gl3.h */; settings = {ATTRIBUTES = (Public, ); }; };
 87 5C1BAA9B1DFB60FF002906BB /* gl3platform.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1BAA971DFB60FF002906BB /* gl3platform.h */; settings = {ATTRIBUTES = (Public, ); }; };
 88 5C1BAA9C1DFB60FF002906BB /* gl31.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1BAA981DFB60FF002906BB /* gl31.h */; settings = {ATTRIBUTES = (Public, ); }; };
 89 5C1BAA9D1DFB60FF002906BB /* gl32.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1BAA991DFB60FF002906BB /* gl32.h */; settings = {ATTRIBUTES = (Public, ); }; };
 90 5C1BAAA21DFB610E002906BB /* gl2.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1BAA9E1DFB610E002906BB /* gl2.h */; settings = {ATTRIBUTES = (Public, ); }; };
 91 5C1BAAA31DFB610E002906BB /* gl2ext.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1BAA9F1DFB610E002906BB /* gl2ext.h */; settings = {ATTRIBUTES = (Public, ); }; };
 92 5C1BAAA41DFB610E002906BB /* gl2platform.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1BAAA01DFB610E002906BB /* gl2platform.h */; settings = {ATTRIBUTES = (Public, ); }; };
 93 5C1BAAAA1DFB6124002906BB /* egl.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1BAAA61DFB6124002906BB /* egl.h */; settings = {ATTRIBUTES = (Public, ); }; };
 94 5C1BAAAB1DFB6124002906BB /* eglext.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1BAAA71DFB6124002906BB /* eglext.h */; settings = {ATTRIBUTES = (Public, ); }; };
 95 5C1BAAAC1DFB6124002906BB /* eglplatform.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1BAAA81DFB6124002906BB /* eglplatform.h */; settings = {ATTRIBUTES = (Public, ); }; };
 96 5C1BAAAF1DFB6A12002906BB /* export.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1BAAAE1DFB6A12002906BB /* export.h */; settings = {ATTRIBUTES = (Public, ); }; };
 97 5C1BAAB01DFB6EC6002906BB /* entry_points_gles_3_0.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB300C31DE39E7500D2C405 /* entry_points_gles_3_0.cpp */; };
 98 5C1BAAB11DFB6F33002906BB /* global_state.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB300C71DE39E7500D2C405 /* global_state.cpp */; };
 99 5C1BAAB21DFB6F45002906BB /* entry_points_gles_3_1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB300C51DE39E7500D2C405 /* entry_points_gles_3_1.cpp */; };
 100 5C1BAAB31DFB6F4B002906BB /* entry_points_gles_2_0.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB300C11DE39E7500D2C405 /* entry_points_gles_2_0.cpp */; };
 101 5C1BAAB41DFB6F4F002906BB /* entry_points_gles_2_0_ext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB300BF1DE39E7500D2C405 /* entry_points_gles_2_0_ext.cpp */; };
 102 5C1BAAB51DFB6F54002906BB /* entry_points_egl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB300BD1DE39E7500D2C405 /* entry_points_egl.cpp */; };
 103 5C1BAAB61DFB6F58002906BB /* entry_points_egl_ext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB300BB1DE39E7500D2C405 /* entry_points_egl_ext.cpp */; };
86104 5C1DBBE61B04075B00235552 /* ShaderVars.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1DBBE51B04075B00235552 /* ShaderVars.h */; settings = {ATTRIBUTES = (Public, ); }; };
87105 5C1DBBF01B0436EC00235552 /* angleutils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C1DBBE71B0436EC00235552 /* angleutils.cpp */; };
88106 5C1DBBF11B0436EC00235552 /* MemoryBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C1DBBE81B0436EC00235552 /* MemoryBuffer.cpp */; };

282300 5CB304921DE4156200D2C405 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CB3048D1DE4144400D2C405 /* OpenGL.framework */; };
283301 5CB304931DE4156B00D2C405 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CB3048F1DE4145500D2C405 /* QuartzCore.framework */; };
284302 5CB304941DE4157200D2C405 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CB3048B1DE4143500D2C405 /* CoreGraphics.framework */; };
285  5CB304961DE4157B00D2C405 /* entry_points_egl_ext.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB300BC1DE39E7500D2C405 /* entry_points_egl_ext.h */; };
286  5CB304981DE4157B00D2C405 /* entry_points_egl.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB300BE1DE39E7500D2C405 /* entry_points_egl.h */; };
287  5CB3049A1DE4157B00D2C405 /* entry_points_gles_2_0_ext.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB300C01DE39E7500D2C405 /* entry_points_gles_2_0_ext.h */; };
288  5CB3049C1DE4157B00D2C405 /* entry_points_gles_2_0.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB300C21DE39E7500D2C405 /* entry_points_gles_2_0.h */; };
289  5CB3049E1DE4157B00D2C405 /* entry_points_gles_3_0.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB300C41DE39E7500D2C405 /* entry_points_gles_3_0.h */; };
290  5CB304A01DE4157B00D2C405 /* entry_points_gles_3_1.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB300C61DE39E7500D2C405 /* entry_points_gles_3_1.h */; };
 303 5CB304961DE4157B00D2C405 /* entry_points_egl_ext.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB300BC1DE39E7500D2C405 /* entry_points_egl_ext.h */; settings = {ATTRIBUTES = (Public, ); }; };
 304 5CB304981DE4157B00D2C405 /* entry_points_egl.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB300BE1DE39E7500D2C405 /* entry_points_egl.h */; settings = {ATTRIBUTES = (Public, ); }; };
 305 5CB3049A1DE4157B00D2C405 /* entry_points_gles_2_0_ext.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB300C01DE39E7500D2C405 /* entry_points_gles_2_0_ext.h */; settings = {ATTRIBUTES = (Public, ); }; };
 306 5CB3049C1DE4157B00D2C405 /* entry_points_gles_2_0.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB300C21DE39E7500D2C405 /* entry_points_gles_2_0.h */; settings = {ATTRIBUTES = (Public, ); }; };
 307 5CB3049E1DE4157B00D2C405 /* entry_points_gles_3_0.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB300C41DE39E7500D2C405 /* entry_points_gles_3_0.h */; settings = {ATTRIBUTES = (Public, ); }; };
 308 5CB304A01DE4157B00D2C405 /* entry_points_gles_3_1.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB300C61DE39E7500D2C405 /* entry_points_gles_3_1.h */; settings = {ATTRIBUTES = (Public, ); }; };
291309 5CB304A21DE4157B00D2C405 /* global_state.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB300C81DE39E7500D2C405 /* global_state.h */; };
292310 5CB304A41DE4157B00D2C405 /* resource.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB300CC1DE39E7500D2C405 /* resource.h */; };
293311 5CB304A61DE4157E00D2C405 /* resource.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB300B81DE39E6300D2C405 /* resource.h */; };

333351 5CB305011DE4164800D2C405 /* TransformFeedbackImpl_mock.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB304D71DE4164800D2C405 /* TransformFeedbackImpl_mock.h */; };
334352 5CB305021DE4164800D2C405 /* TransformFeedbackImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB304D81DE4164800D2C405 /* TransformFeedbackImpl.h */; };
335353 5CB305031DE4164800D2C405 /* VertexArrayImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB304D91DE4164800D2C405 /* VertexArrayImpl.h */; };
 354 5CB5E1A71DFB8AF600F90FC9 /* libEGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB300B51DE39E6300D2C405 /* libEGL.cpp */; };
336355 5CC7D452191024E4000B8C1F /* LoopInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CC7D44B191024E3000B8C1F /* LoopInfo.cpp */; };
337356 5CC7D453191024E4000B8C1F /* LoopInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CC7D44C191024E4000B8C1F /* LoopInfo.h */; };
338357 5CC7D457191024E4000B8C1F /* ValidateOutputs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CC7D450191024E4000B8C1F /* ValidateOutputs.cpp */; };

530549 31012E1118B97B9B0039062F /* VersionGLSL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VersionGLSL.h; sourceTree = "<group>"; };
531550 312BDB0915FEC91E0097EBC7 /* ANGLE.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = ANGLE.plist; sourceTree = "<group>"; };
532551 312BDB0A15FECA3A0097EBC7 /* ANGLE.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ANGLE.txt; sourceTree = "<group>"; };
 552 5C1BAA961DFB60FF002906BB /* gl3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gl3.h; path = include/GLES3/gl3.h; sourceTree = "<group>"; };
 553 5C1BAA971DFB60FF002906BB /* gl3platform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gl3platform.h; path = include/GLES3/gl3platform.h; sourceTree = "<group>"; };
 554 5C1BAA981DFB60FF002906BB /* gl31.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gl31.h; path = include/GLES3/gl31.h; sourceTree = "<group>"; };
 555 5C1BAA991DFB60FF002906BB /* gl32.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gl32.h; path = include/GLES3/gl32.h; sourceTree = "<group>"; };
 556 5C1BAA9E1DFB610E002906BB /* gl2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gl2.h; path = include/GLES2/gl2.h; sourceTree = "<group>"; };
 557 5C1BAA9F1DFB610E002906BB /* gl2ext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gl2ext.h; path = include/GLES2/gl2ext.h; sourceTree = "<group>"; };
 558 5C1BAAA01DFB610E002906BB /* gl2platform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gl2platform.h; path = include/GLES2/gl2platform.h; sourceTree = "<group>"; };
 559 5C1BAAA61DFB6124002906BB /* egl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = egl.h; path = include/EGL/egl.h; sourceTree = "<group>"; };
 560 5C1BAAA71DFB6124002906BB /* eglext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = eglext.h; path = include/EGL/eglext.h; sourceTree = "<group>"; };
 561 5C1BAAA81DFB6124002906BB /* eglplatform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = eglplatform.h; path = include/EGL/eglplatform.h; sourceTree = "<group>"; };
 562 5C1BAAAE1DFB6A12002906BB /* export.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = export.h; path = include/export.h; sourceTree = "<group>"; };
533563 5C1DBBE51B04075B00235552 /* ShaderVars.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShaderVars.h; sourceTree = "<group>"; };
534564 5C1DBBE71B0436EC00235552 /* angleutils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = angleutils.cpp; path = src/common/angleutils.cpp; sourceTree = "<group>"; };
535565 5C1DBBE81B0436EC00235552 /* MemoryBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MemoryBuffer.cpp; path = src/common/MemoryBuffer.cpp; sourceTree = "<group>"; };

10921122 name = misc;
10931123 sourceTree = "<group>";
10941124 };
 1125 5C1BAA931DFB60E2002906BB /* EGL */ = {
 1126 isa = PBXGroup;
 1127 children = (
 1128 5C1BAAA61DFB6124002906BB /* egl.h */,
 1129 5C1BAAA71DFB6124002906BB /* eglext.h */,
 1130 5C1BAAA81DFB6124002906BB /* eglplatform.h */,
 1131 );
 1132 name = EGL;
 1133 sourceTree = "<group>";
 1134 };
 1135 5C1BAA941DFB60EA002906BB /* GLES2 */ = {
 1136 isa = PBXGroup;
 1137 children = (
 1138 5C1BAA9E1DFB610E002906BB /* gl2.h */,
 1139 5C1BAA9F1DFB610E002906BB /* gl2ext.h */,
 1140 5C1BAAA01DFB610E002906BB /* gl2platform.h */,
 1141 );
 1142 name = GLES2;
 1143 sourceTree = "<group>";
 1144 };
 1145 5C1BAA951DFB60EF002906BB /* GLES3 */ = {
 1146 isa = PBXGroup;
 1147 children = (
 1148 5C1BAA961DFB60FF002906BB /* gl3.h */,
 1149 5C1BAA971DFB60FF002906BB /* gl3platform.h */,
 1150 5C1BAA981DFB60FF002906BB /* gl31.h */,
 1151 5C1BAA991DFB60FF002906BB /* gl32.h */,
 1152 );
 1153 name = GLES3;
 1154 sourceTree = "<group>";
 1155 };
10951156 5C1DBC471B0438B700235552 /* libANGLE */ = {
10961157 isa = PBXGroup;
10971158 children = (

14331494 A29B15E916978B7D00111D97 /* include */ = {
14341495 isa = PBXGroup;
14351496 children = (
 1497 5C1BAAAE1DFB6A12002906BB /* export.h */,
 1498 5C1BAA951DFB60EF002906BB /* GLES3 */,
 1499 5C1BAA941DFB60EA002906BB /* GLES2 */,
 1500 5C1BAA931DFB60E2002906BB /* EGL */,
14361501 FB39D2BD1200F3E600088E69 /* GLSLANG */,
14371502 A264F8CB169762AA006FAA5A /* KHR */,
14381503 );

15311596 buildActionMask = 2147483647;
15321597 files = (
15331598 5C315D131CC5B6DA00776697 /* ValidateMaxParameters.h in Headers */,
 1599 5C1BAAAB1DFB6124002906BB /* eglext.h in Headers */,
15341600 5CB3012A1DE39F1A00D2C405 /* functionsgl_typedefs.h in Headers */,
 1601 5C1BAA9C1DFB60FF002906BB /* gl31.h in Headers */,
15351602 5C315D071CC5B6DA00776697 /* RemoveDynamicIndexing.h in Headers */,
15361603 31012E3C18B97B9B0039062F /* InitializeParseContext.h in Headers */,
15371604 A08C3CDD16D6CB61003F0B83 /* ArrayBoundsClamper.h in Headers */,
15381605 5CB3011D1DE39F1A00D2C405 /* ContextGL.h in Headers */,
 1606 5C1BAA9B1DFB60FF002906BB /* gl3platform.h in Headers */,
15391607 5CB304F21DE4164800D2C405 /* ProgramImpl_mock.h in Headers */,
15401608 5CCD81731DBFE999006066B8 /* Debug.h in Headers */,
15411609 5CC7D46F19102621000B8C1F /* debug.h in Headers */,

15921660 5C1DBF3E1B0438D300235552 /* validationES3.h in Headers */,
15931661 5CB301261DE39F1A00D2C405 /* formatutilsgl.h in Headers */,
15941662 5C1DBC2F1B04375F00235552 /* Intermediate.h in Headers */,
 1663 5C1BAAAA1DFB6124002906BB /* egl.h in Headers */,
15951664 5CB3013A1DE39F1A00D2C405 /* SamplerGL.h in Headers */,
15961665 5CB304F81DE4164800D2C405 /* renderer_utils.h in Headers */,
15971666 31012E5F18B97B9B0039062F /* RewriteElseBlocks.h in Headers */,

16081677 5C315D051CC5B6DA00776697 /* RecordConstantPrecision.h in Headers */,
16091678 5C1DBDFA1B0438D300235552 /* histogram_macros.h in Headers */,
16101679 5C1DBDD71B0438D300235552 /* BinaryStream.h in Headers */,
 1680 5C1BAAAF1DFB6A12002906BB /* export.h in Headers */,
 1681 5C1BAA9A1DFB60FF002906BB /* gl3.h in Headers */,
16111682 5CCD81AB1DBFEA5C006066B8 /* AddAndTrueToLoopCondition.h in Headers */,
16121683 31012E3A18B97B9B0039062F /* InitializeGlobals.h in Headers */,
16131684 5C1DBC291B04375F00235552 /* BuiltInFunctionEmulatorGLSL.h in Headers */,

16271698 5C1DBDF91B0438D300235552 /* HandleAllocator.h in Headers */,
16281699 5CB304FA1DE4164800D2C405 /* ShaderImpl.h in Headers */,
16291700 5C1DBDD91B0438D300235552 /* Buffer.h in Headers */,
 1701 5C1BAA9D1DFB60FF002906BB /* gl32.h in Headers */,
16301702 5CCD81BC1DBFEA5C006066B8 /* SimplifyLoopConditions.h in Headers */,
 1703 5C1BAAA41DFB610E002906BB /* gl2platform.h in Headers */,
16311704 31012E2718B97B9B0039062F /* Diagnostics.h in Headers */,
16321705 5CB305031DE4164800D2C405 /* VertexArrayImpl.h in Headers */,
16331706 5C1DBC361B04375F00235552 /* PruneEmptyDeclarations.h in Headers */,

16521725 5CB304A21DE4157B00D2C405 /* global_state.h in Headers */,
16531726 31012E6518B97B9B0039062F /* SymbolTable.h in Headers */,
16541727 5C1DBC321B04375F00235552 /* length_limits.h in Headers */,
 1728 5C1BAAA31DFB610E002906BB /* gl2ext.h in Headers */,
16551729 5CC7D458191024E4000B8C1F /* ValidateOutputs.h in Headers */,
16561730 31012E7418B97B9B0039062F /* UnfoldShortCircuitAST.h in Headers */,
16571731 5C1DBDF41B0438D300235552 /* Framebuffer.h in Headers */,

16911765 5C1DBBF51B0436EC00235552 /* platform.h in Headers */,
16921766 5C315D0F1CC5B6DA00776697 /* UnfoldShortCircuitToIf.h in Headers */,
16931767 5CC7D47A19102621000B8C1F /* utilities.h in Headers */,
 1768 5C1BAAA21DFB610E002906BB /* gl2.h in Headers */,
16941769 5CB304F51DE4164800D2C405 /* RenderbufferImpl_mock.h in Headers */,
16951770 5CB301511DE39F4700D2C405 /* PbufferSurfaceCGL.h in Headers */,
16961771 31012E3918B97B9B0039062F /* InitializeDll.h in Headers */,

17551830 5CCD818D1DBFEA10006066B8 /* BitSetIterator.h in Headers */,
17561831 5CB301531DE39F4700D2C405 /* WindowSurfaceCGL.h in Headers */,
17571832 5C1DBC401B04375F00235552 /* SeparateDeclarations.h in Headers */,
 1833 5C1BAAAC1DFB6124002906BB /* eglplatform.h in Headers */,
17581834 5C315CFF1CC5B6DA00776697 /* Cache.h in Headers */,
17591835 5C1DBDD61B0438D300235552 /* AttributeMap.h in Headers */,
17601836 5CCD81841DBFE999006066B8 /* Version.h in Headers */,

18421918 A264F8AC16974DED006FAA5A /* DiagnosticsBase.cpp in Sources */,
18431919 5C315D101CC5B6DA00776697 /* ValidateGlobalInitializer.cpp in Sources */,
18441920 5C1DBF291B0438D300235552 /* Shader.cpp in Sources */,
 1921 5CB5E1A71DFB8AF600F90FC9 /* libEGL.cpp in Sources */,
18451922 31012E1518B97B9B0039062F /* CodeGen.cpp in Sources */,
18461923 5C1DBDF81B0438D300235552 /* HandleAllocator.cpp in Sources */,
18471924 31012E3F18B97B9B0039062F /* Intermediate.cpp in Sources */,

19011978 5C1DBC261B04375F00235552 /* blocklayoutHLSL.cpp in Sources */,
19021979 5CB301161DE39F1A00D2C405 /* BlitGL.cpp in Sources */,
19031980 5CB301231DE39F1A00D2C405 /* FenceSyncGL.cpp in Sources */,
 1981 5C1BAAB01DFB6EC6002906BB /* entry_points_gles_3_0.cpp in Sources */,
 1982 5C1BAAB41DFB6F4F002906BB /* entry_points_gles_2_0_ext.cpp in Sources */,
19041983 5C315D081CC5B6DA00776697 /* RemovePow.cpp in Sources */,
19051984 5CB301201DE39F1A00D2C405 /* FeatureSupportGL.md in Sources */,
19061985 A264F8B416974DED006FAA5A /* Input.cpp in Sources */,

19131992 31012E6218B97B9B0039062F /* ShaderLang.cpp in Sources */,
19141993 5C1DBF2E1B0438D300235552 /* Surface.cpp in Sources */,
19151994 5C1DBF3B1B0438D300235552 /* validationES2.cpp in Sources */,
 1995 5C1BAAB31DFB6F4B002906BB /* entry_points_gles_2_0.cpp in Sources */,
19161996 5CB3013D1DE39F1A00D2C405 /* StateManagerGL.cpp in Sources */,
19171997 5CCD81801DBFE999006066B8 /* Stream.cpp in Sources */,
19181998 31012E3818B97B9B0039062F /* InitializeDll.cpp in Sources */,

19392019 31012E5618B97B9B0039062F /* PoolAlloc.cpp in Sources */,
19402020 5C1DBC351B04375F00235552 /* PruneEmptyDeclarations.cpp in Sources */,
19412021 5C1DBDF11B0438D300235552 /* formatutils.cpp in Sources */,
 2022 5C1BAAB51DFB6F54002906BB /* entry_points_egl.cpp in Sources */,
 2023 5C1BAAB61DFB6F58002906BB /* entry_points_egl_ext.cpp in Sources */,
19422024 5CB3013B1DE39F1A00D2C405 /* ShaderGL.cpp in Sources */,
19432025 31012E7918B97B9B0039062F /* ValidateLimitations.cpp in Sources */,
19442026 5CB301411DE39F1A00D2C405 /* TextureGL.cpp in Sources */,
19452027 31012E7718B97B9B0039062F /* util.cpp in Sources */,
19462028 5CB304FC1DE4164800D2C405 /* SurfaceImpl.cpp in Sources */,
19472029 5C1DBDE21B0438D300235552 /* Context.cpp in Sources */,
 2030 5C1BAAB21DFB6F45002906BB /* entry_points_gles_3_1.cpp in Sources */,
19482031 5CB304FF1DE4164800D2C405 /* TextureImpl.cpp in Sources */,
19492032 31012E5118B97B9B0039062F /* OutputHLSL.cpp in Sources */,
19502033 5CCD81AC1DBFEA5C006066B8 /* AddDefaultReturnStatements.cpp in Sources */,

19952078 5C1DBC281B04375F00235552 /* BuiltInFunctionEmulatorGLSL.cpp in Sources */,
19962079 5CCD81B01DBFEA5C006066B8 /* ConstantUnion.cpp in Sources */,
19972080 5C1DBDD51B0438D300235552 /* AttributeMap.cpp in Sources */,
 2081 5C1BAAB11DFB6F33002906BB /* global_state.cpp in Sources */,
19982082 31012E6A18B97B9B0039062F /* TranslatorESSL.cpp in Sources */,
19992083 31012E4F18B97B9B0039062F /* OutputGLSLBase.cpp in Sources */,
20002084 5C1DBC3B1B04375F00235552 /* ScalarizeVecAndMatConstructorArgs.cpp in Sources */,
209782

Source/ThirdParty/ANGLE/ANGLE/egl.h

 1#include "include/EGL/egl.h"
nonexistent

Source/ThirdParty/ANGLE/ANGLE/eglext.h

 1#include "include/EGL/eglext.h"
nonexistent

Source/ThirdParty/ANGLE/ANGLE/eglplatform.h

 1#include "include/EGL/eglplatform.h"
nonexistent

Source/ThirdParty/ANGLE/ANGLE/entry_points_gles_2_0.h

 1#include "src/libGLESv2/entry_points_gles_2_0.h"
nonexistent

Source/ThirdParty/ANGLE/ANGLE/entry_points_gles_2_0_ext.h

 1#include "src/libGLESv2/entry_points_gles_2_0_ext.h"
nonexistent

Source/ThirdParty/ANGLE/ANGLE/entry_points_gles_3_0.h

 1#include "src/libGLESv2/entry_points_gles_3_0.h"
nonexistent

Source/ThirdParty/ANGLE/ANGLE/export.h

 1#include "include/export.h"
nonexistent

Source/ThirdParty/ANGLE/ANGLE/gl2.h

 1#include "include/GLES2/gl2.h"
nonexistent

Source/ThirdParty/ANGLE/ANGLE/gl2ext.h

 1#include "include/GLES2/gl2ext.h"
nonexistent

Source/ThirdParty/ANGLE/ANGLE/gl2platform.h

 1#include "include/GLES2/gl2platform.h"
nonexistent

Source/ThirdParty/ANGLE/ANGLE/gl3.h

 1#include "include/GLES3/gl3.h"
nonexistent

Source/ThirdParty/ANGLE/ANGLE/gl3platform.h

 1#include "include/GLES3/gl3platform.h"
nonexistent

Source/ThirdParty/ANGLE/ANGLE/gl31.h

 1#include "include/GLES3/gl31.h"
nonexistent

Source/ThirdParty/ANGLE/ANGLE/khrplatform.h

 1#include "include/KHR/khrplatform.h"
nonexistent

Source/ThirdParty/ANGLE/include/EGL/egl.h

@@extern "C" {
5959#define EGL_VERSION_1_0 1
6060typedef unsigned int EGLBoolean;
6161typedef void *EGLDisplay;
62 #include <KHR/khrplatform.h>
63 #include <EGL/eglplatform.h>
 62#include <ANGLE/khrplatform.h>
 63#include <ANGLE/eglplatform.h>
6464typedef void *EGLConfig;
6565typedef void *EGLSurface;
6666typedef void *EGLContext;

@@EGLAPI EGLBoolean EGLAPIENTRY eglWaitSyn
313313#endif /* EGL_VERSION_1_5 */
314314
315315#if EGL_SOFT_LINKING
316 #include <EGL/eglsoftlinking.h>
 316#include <ANGLE/eglsoftlinking.h>
317317#endif
318318
319319#ifdef __cplusplus
209782

Source/ThirdParty/ANGLE/include/EGL/eglplatform.h

3434 * by filing a bug against product "EGL" component "Registry".
3535 */
3636
37 #include <KHR/khrplatform.h>
 37#include <ANGLE/khrplatform.h>
3838
3939/* Macros used in EGL function prototype declarations.
4040 *
209782

Source/ThirdParty/ANGLE/include/GLES2/gl2.h

@@extern "C" {
5656
5757#ifndef GL_ES_VERSION_2_0
5858#define GL_ES_VERSION_2_0 1
59 #include <KHR/khrplatform.h>
 59#include <ANGLE/khrplatform.h>
6060typedef khronos_int8_t GLbyte;
6161typedef khronos_float_t GLclampf;
6262typedef khronos_int32_t GLfixed;

@@typedef void (GL_APIENTRYP PFNGLVERTEXAT
522522typedef void (GL_APIENTRYP PFNGLVIEWPORTPROC) (GLint x, GLint y, GLsizei width, GLsizei height);
523523
524524#if defined(_MSC_VER) && !defined(ANGLE_WEBKIT_WIN)
525 #include <GLES2/gl2softlinking.h>
 525#include <ANGLE/gl2softlinking.h>
526526#else
527527
528528#ifdef GL_GLEXT_PROTOTYPES
209782

Source/ThirdParty/ANGLE/include/GLES2/gl2platform.h

1717 * by filing a bug against product "OpenGL-ES" component "Registry".
1818 */
1919
20 #include <KHR/khrplatform.h>
 20#include <ANGLE/khrplatform.h>
2121
2222#ifndef GL_APICALL
2323#define GL_APICALL KHRONOS_APICALL
209782

Source/ThirdParty/ANGLE/include/GLES3/gl3.h

@@extern "C" {
3636** Khronos $Revision: 31811 $ on $Date: 2015-08-10 00:01:11 -0700 (Mon, 10 Aug 2015) $
3737*/
3838
39 #include <GLES3/gl3platform.h>
 39#include <ANGLE/gl3platform.h>
4040
4141#ifndef GL_APIENTRYP
4242#define GL_APIENTRYP GL_APIENTRY*

@@extern "C" {
5656
5757#ifndef GL_ES_VERSION_2_0
5858#define GL_ES_VERSION_2_0 1
59 #include <KHR/khrplatform.h>
 59#include <ANGLE/khrplatform.h>
6060typedef khronos_int8_t GLbyte;
6161typedef khronos_float_t GLclampf;
6262typedef khronos_int32_t GLfixed;
209782

Source/ThirdParty/ANGLE/include/GLES3/gl3platform.h

1717 * by filing a bug against product "OpenGL-ES" component "Registry".
1818 */
1919
20 #include <KHR/khrplatform.h>
 20#include <ANGLE/khrplatform.h>
2121
2222#ifndef GL_APICALL
2323#define GL_APICALL KHRONOS_APICALL
209782

Source/ThirdParty/ANGLE/include/GLES3/gl31.h

@@extern "C" {
3636** Khronos $Revision$ on $Date$
3737*/
3838
39 #include <GLES3/gl3platform.h>
 39#include <ANGLE/gl3platform.h>
4040
4141#ifndef GL_APIENTRYP
4242#define GL_APIENTRYP GL_APIENTRY*

@@extern "C" {
5656
5757#ifndef GL_ES_VERSION_2_0
5858#define GL_ES_VERSION_2_0 1
59 #include <KHR/khrplatform.h>
 59#include <ANGLE/khrplatform.h>
6060typedef khronos_int8_t GLbyte;
6161typedef khronos_float_t GLclampf;
6262typedef khronos_int32_t GLfixed;
209782

Source/ThirdParty/ANGLE/include/GLES3/gl32.h

@@extern "C" {
3636** Khronos $Revision$ on $Date$
3737*/
3838
39 #include <GLES3/gl3platform.h>
 39#include <ANGLE/gl3platform.h>
4040
4141#ifndef GL_APIENTRYP
4242#define GL_APIENTRYP GL_APIENTRY*

@@extern "C" {
5656
5757#ifndef GL_ES_VERSION_2_0
5858#define GL_ES_VERSION_2_0 1
59 #include <KHR/khrplatform.h>
 59#include <ANGLE/khrplatform.h>
6060typedef khronos_int8_t GLbyte;
6161typedef khronos_float_t GLclampf;
6262typedef khronos_int32_t GLfixed;
209782

Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl.h

99#ifndef LIBGLESV2_ENTRYPOINTSEGL_H_
1010#define LIBGLESV2_ENTRYPOINTSEGL_H_
1111
12 #include <EGL/egl.h>
13 #include <export.h>
 12#include <ANGLE/egl.h>
 13#include <ANGLE/export.h>
1414
1515namespace egl
1616{
209782

Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl_ext.h

99#ifndef LIBGLESV2_ENTRYPOINTSEGLEXT_H_
1010#define LIBGLESV2_ENTRYPOINTSEGLEXT_H_
1111
12 #include <EGL/egl.h>
13 #include <EGL/eglext.h>
14 #include <export.h>
 12#include <ANGLE/egl.h>
 13#include <ANGLE/eglext.h>
 14#include <ANGLE/export.h>
1515
1616namespace egl
1717{
209782

Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_2_0.h

99#ifndef LIBGLESV2_ENTRYPOINTGLES20_H_
1010#define LIBGLESV2_ENTRYPOINTGLES20_H_
1111
12 #include <GLES2/gl2.h>
13 #include <export.h>
 12#include <ANGLE/gl2.h>
 13#include <ANGLE/export.h>
1414
1515namespace gl
1616{
209782

Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_2_0_ext.h

99#ifndef LIBGLESV2_ENTRYPOINTGLES20EXT_H_
1010#define LIBGLESV2_ENTRYPOINTGLES20EXT_H_
1111
12 #include <GLES2/gl2.h>
13 #include <GLES2/gl2ext.h>
14 #include <export.h>
 12#include <ANGLE/gl2.h>
 13#include <ANGLE/gl2ext.h>
 14#include <ANGLE/export.h>
1515
1616namespace gl
1717{
209782

Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_3_0.h

99#ifndef LIBGLESV2_ENTRYPOINTGLES30_H_
1010#define LIBGLESV2_ENTRYPOINTGLES30_H_
1111
12 #include <GLES3/gl3.h>
13 #include <export.h>
 12#include <ANGLE/gl3.h>
 13#include <ANGLE/export.h>
1414
1515namespace gl
1616{
209782

Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_3_1.h

99#ifndef LIBGLESV2_ENTRYPOINTGLES31_H_
1010#define LIBGLESV2_ENTRYPOINTGLES31_H_
1111
12 #include <GLES3/gl31.h>
13 #include <export.h>
 12#include <ANGLE/gl31.h>
 13#include <ANGLE/export.h>
1414
1515// we include the platform.h header since it undefines the conflicting MemoryBarrier macro
1616#include "common/platform.h"
209782

Source/WebCore/ChangeLog

 12016-12-14 Alex Christensen <achristensen@webkit.org>
 2
 3 Progress towards using ANGLE to do WebGL rendering
 4 https://bugs.webkit.org/show_bug.cgi?id=165864
 5
 6 Reviewed by NOBODY (OOPS!).
 7
 8 No new tests, no change in behavior.
 9 Just compile fixes for a configuration that will soon be standard
 10 that can be landed now without breaking anything.
 11
 12 * platform/graphics/PlatformDisplay.cpp:
 13 (WebCore::PlatformDisplay::sharedDisplay):
 14 Ignore some clang warnings that will cause problems when this is compiled on Mac.
 15
1162016-12-14 Alex Christensen <achristensen@webkit.org>
217
318 REGRESSION (r209776): [ios-simulator] LayoutTest http/tests/xmlhttprequest/on-network-timeout-error-during-preflight.html is timing out
209819

Source/WebCore/CMakeLists.txt

@@if (ENABLE_GRAPHICS_CONTEXT_3D AND NOT W
39123912 ANGLE_ENABLE_GLSL)
39133913
39143914 target_include_directories(ANGLESupport PRIVATE
 3915 "${THIRDPARTY_DIR}/ANGLE"
39153916 "${THIRDPARTY_DIR}/ANGLE/include"
39163917 "${THIRDPARTY_DIR}/ANGLE/include/KHR"
39173918 "${THIRDPARTY_DIR}/ANGLE/src"
209782

Source/WebCore/platform/graphics/PlatformDisplay.cpp

@@std::unique_ptr<PlatformDisplay> Platfor
113113PlatformDisplay& PlatformDisplay::sharedDisplay()
114114{
115115 static std::once_flag onceFlag;
 116#pragma clang diagnostic push
 117#pragma clang diagnostic ignored "-Wexit-time-destructors"
116118 static std::unique_ptr<PlatformDisplay> display;
 119#pragma clang diagnostic pop
117120 std::call_once(onceFlag, []{
118121 display = createPlatformDisplay();
119122 });
209782