WebKit Bugzilla
Attachment 371212 Details for
Bug 197755
: Add preliminary ANGLE backend to WebCore
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-197755-20190603112805.patch (text/plain), 73.17 KB, created by
Kenneth Russell
on 2019-06-03 14:28:07 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Kenneth Russell
Created:
2019-06-03 14:28:07 PDT
Size:
73.17 KB
patch
obsolete
>Subversion Revision: 245157 >diff --git a/Source/ThirdParty/ANGLE/ChangeLog b/Source/ThirdParty/ANGLE/ChangeLog >index da940b557f7803bf46da6795d3ba3d3c0172a472..1b76eb9b83ae35a51366447b0ddbf14479afa80c 100644 >--- a/Source/ThirdParty/ANGLE/ChangeLog >+++ b/Source/ThirdParty/ANGLE/ChangeLog >@@ -1,3 +1,36 @@ >+2019-06-03 Kenneth Russell <kbr@chromium.org> >+ >+ Support using ANGLE as the backend for the WebGL implementation >+ https://bugs.webkit.org/show_bug.cgi?id=197755 >+ >+ Adjust ANGLE build inside WebKit for inclusion in WebCore. >+ >+ Add a build step which processes ANGLE's copied public headers so they >+ can all be referred to under the <ANGLE/xyz.h> prefix. This avoids >+ touching ANGLE's headers and allows WebCore to include them with no >+ additional include path modifications. >+ >+ Add missed files to the build which are needed to link ANGLE's >+ rendering backend into WebCore. Made necessary changes to newly >+ compiled sources, and documented them in changes.diff. >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * ANGLE.xcodeproj/project.pbxproj: >+ * adjust-angle-include-paths.sh: Added. >+ * changes.diff: >+ * src/gpu_info_util/SystemInfo.cpp: >+ (angle::ParseMacMachineModel): >+ * src/gpu_info_util/SystemInfo_mac.mm: >+ (angle::GetSystemInfo): >+ * src/libANGLE/renderer/gl/cgl/DisplayCGL.mm: >+ * src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.mm: >+ (rx::IOSurfaceSurfaceCGL::IOSurfaceSurfaceCGL): >+ * src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.h: >+ * src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm: >+ (rx::WindowSurfaceCGL::initialize): >+ (-[SwapLayer initWithSharedState:withContext:withFunctions:]): Deleted. >+ > 2019-05-09 Don Olmstead <don.olmstead@sony.com> > > [ANGLE] Update ANGLE >diff --git a/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj b/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj >index 458008d17c648dda0cc68c268c80eda6e73acf49..b28aa42552709a765b798f2e250552f53aca09dc 100644 >--- a/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj >+++ b/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj >@@ -127,8 +127,8 @@ > 315EBDFA1FCE452D00AC7A89 /* WorkerThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 315EBDE31FCE452D00AC7A89 /* WorkerThread.h */; }; > 315EBE031FCE456200AC7A89 /* proc_table_autogen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 315EBDFB1FCE456100AC7A89 /* proc_table_autogen.cpp */; }; > 315EBE041FCE456200AC7A89 /* proc_table.h in Headers */ = {isa = PBXBuildFile; fileRef = 315EBDFC1FCE456100AC7A89 /* proc_table.h */; }; >- 315EBE051FCE456200AC7A89 /* entry_points_gles_3_0_autogen.h in Headers */ = {isa = PBXBuildFile; fileRef = 315EBDFD1FCE456100AC7A89 /* entry_points_gles_3_0_autogen.h */; }; >- 315EBE061FCE456200AC7A89 /* entry_points_gles_2_0_autogen.h in Headers */ = {isa = PBXBuildFile; fileRef = 315EBDFE1FCE456100AC7A89 /* entry_points_gles_2_0_autogen.h */; }; >+ 315EBE051FCE456200AC7A89 /* entry_points_gles_3_0_autogen.h in Headers */ = {isa = PBXBuildFile; fileRef = 315EBDFD1FCE456100AC7A89 /* entry_points_gles_3_0_autogen.h */; settings = {ATTRIBUTES = (Public, ); }; }; >+ 315EBE061FCE456200AC7A89 /* entry_points_gles_2_0_autogen.h in Headers */ = {isa = PBXBuildFile; fileRef = 315EBDFE1FCE456100AC7A89 /* entry_points_gles_2_0_autogen.h */; settings = {ATTRIBUTES = (Public, ); }; }; > 315EBE071FCE456200AC7A89 /* entry_points_gles_3_1_autogen.h in Headers */ = {isa = PBXBuildFile; fileRef = 315EBDFF1FCE456100AC7A89 /* entry_points_gles_3_1_autogen.h */; }; > 315EBE081FCE456200AC7A89 /* entry_points_gles_3_0_autogen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 315EBE001FCE456100AC7A89 /* entry_points_gles_3_0_autogen.cpp */; }; > 315EBE091FCE456200AC7A89 /* entry_points_gles_3_1_autogen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 315EBE011FCE456100AC7A89 /* entry_points_gles_3_1_autogen.cpp */; }; >@@ -152,8 +152,8 @@ > 31A331E21EA5EFB800FD2203 /* trace_event.h in Headers */ = {isa = PBXBuildFile; fileRef = 31A331E11EA5EFB800FD2203 /* trace_event.h */; }; > 5C1BAA9A1DFB60FF002906BB /* gl3.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1BAA961DFB60FF002906BB /* gl3.h */; settings = {ATTRIBUTES = (Public, ); }; }; > 5C1BAA9B1DFB60FF002906BB /* gl3platform.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1BAA971DFB60FF002906BB /* gl3platform.h */; settings = {ATTRIBUTES = (Public, ); }; }; >- 5C1BAA9C1DFB60FF002906BB /* gl31.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1BAA981DFB60FF002906BB /* gl31.h */; settings = {ATTRIBUTES = (Public, ); }; }; >- 5C1BAA9D1DFB60FF002906BB /* gl32.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1BAA991DFB60FF002906BB /* gl32.h */; settings = {ATTRIBUTES = (Public, ); }; }; >+ 5C1BAA9C1DFB60FF002906BB /* gl31.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1BAA981DFB60FF002906BB /* gl31.h */; }; >+ 5C1BAA9D1DFB60FF002906BB /* gl32.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1BAA991DFB60FF002906BB /* gl32.h */; }; > 5C1BAAA21DFB610E002906BB /* gl2.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1BAA9E1DFB610E002906BB /* gl2.h */; settings = {ATTRIBUTES = (Public, ); }; }; > 5C1BAAA31DFB610E002906BB /* gl2ext.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1BAA9F1DFB610E002906BB /* gl2ext.h */; settings = {ATTRIBUTES = (Public, ); }; }; > 5C1BAAA41DFB610E002906BB /* gl2platform.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1BAAA01DFB610E002906BB /* gl2platform.h */; settings = {ATTRIBUTES = (Public, ); }; }; >@@ -462,7 +462,6 @@ > 5CB301471DE39F1A00D2C405 /* WorkaroundsGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB301151DE39F1A00D2C405 /* WorkaroundsGL.h */; }; > 5CB3014F1DE39F4700D2C405 /* DisplayCGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB301491DE39F4700D2C405 /* DisplayCGL.h */; }; > 5CB301511DE39F4700D2C405 /* PbufferSurfaceCGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB3014B1DE39F4700D2C405 /* PbufferSurfaceCGL.h */; }; >- 5CB301531DE39F4700D2C405 /* WindowSurfaceCGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB3014D1DE39F4700D2C405 /* WindowSurfaceCGL.h */; }; > 5CB304921DE4156200D2C405 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CB3048D1DE4144400D2C405 /* OpenGL.framework */; }; > 5CB304931DE4156B00D2C405 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CB3048F1DE4145500D2C405 /* QuartzCore.framework */; }; > 5CB304941DE4157200D2C405 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CB3048B1DE4143500D2C405 /* CoreGraphics.framework */; }; >@@ -549,6 +548,61 @@ > 5CCD81B01DBFEA5C006066B8 /* ConstantUnion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CCD81991DBFEA5C006066B8 /* ConstantUnion.cpp */; }; > 5CCD81B51DBFEA5C006066B8 /* QualifierTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CCD819E1DBFEA5C006066B8 /* QualifierTypes.cpp */; }; > 5CCD81B61DBFEA5C006066B8 /* QualifierTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CCD819F1DBFEA5C006066B8 /* QualifierTypes.h */; }; >+ 6EDDD1B9229F5DF700AD26F9 /* generatemip.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EDDD1AE229F5DF600AD26F9 /* generatemip.h */; }; >+ 6EDDD1BA229F5DF700AD26F9 /* loadimage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6EDDD1AF229F5DF600AD26F9 /* loadimage.cpp */; }; >+ 6EDDD1BB229F5DF700AD26F9 /* copyimage.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EDDD1B1229F5DF700AD26F9 /* copyimage.h */; }; >+ 6EDDD1BC229F5DF700AD26F9 /* imageformats.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EDDD1B3229F5DF700AD26F9 /* imageformats.h */; }; >+ 6EDDD1BD229F5DF700AD26F9 /* imageformats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6EDDD1B5229F5DF700AD26F9 /* imageformats.cpp */; }; >+ 6EDDD1BE229F5DF700AD26F9 /* loadimage.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EDDD1B6229F5DF700AD26F9 /* loadimage.h */; }; >+ 6EDDD1BF229F5DF700AD26F9 /* loadimage_etc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6EDDD1B7229F5DF700AD26F9 /* loadimage_etc.cpp */; }; >+ 6EDDD1C0229F5DF700AD26F9 /* copyimage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6EDDD1B8229F5DF700AD26F9 /* copyimage.cpp */; }; >+ 6EDDD1C6229F5FD400AD26F9 /* GLES1State.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6EDDD1C1229F5FD300AD26F9 /* GLES1State.cpp */; }; >+ 6EDDD1C7229F5FD400AD26F9 /* GLES1Renderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EDDD1C2229F5FD300AD26F9 /* GLES1Renderer.h */; }; >+ 6EDDD1C8229F5FD400AD26F9 /* GLES1Renderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6EDDD1C3229F5FD300AD26F9 /* GLES1Renderer.cpp */; }; >+ 6EDDD1C9229F5FD400AD26F9 /* GLES1State.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EDDD1C4229F5FD400AD26F9 /* GLES1State.h */; }; >+ 6EDDD1CA229F5FD400AD26F9 /* GLES1Shaders.inc in Sources */ = {isa = PBXBuildFile; fileRef = 6EDDD1C5229F5FD400AD26F9 /* GLES1Shaders.inc */; }; >+ 6EDDD1CF229F618000AD26F9 /* Observer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6EDDD1CB229F617F00AD26F9 /* Observer.cpp */; }; >+ 6EDDD1D0229F618000AD26F9 /* MemoryObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EDDD1CC229F617F00AD26F9 /* MemoryObject.h */; }; >+ 6EDDD1D1229F618000AD26F9 /* MemoryObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6EDDD1CD229F617F00AD26F9 /* MemoryObject.cpp */; }; >+ 6EDDD1D2229F618000AD26F9 /* Observer.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EDDD1CE229F618000AD26F9 /* Observer.h */; }; >+ 6EDDD1DD229F626A00AD26F9 /* validationES3_autogen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EDDD1D3229F626800AD26F9 /* validationES3_autogen.h */; }; >+ 6EDDD1DE229F626A00AD26F9 /* validationES1_autogen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EDDD1D4229F626900AD26F9 /* validationES1_autogen.h */; }; >+ 6EDDD1DF229F626A00AD26F9 /* validationESEXT_autogen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EDDD1D5229F626900AD26F9 /* validationESEXT_autogen.h */; }; >+ 6EDDD1E0229F626A00AD26F9 /* validationESEXT.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EDDD1D6229F626900AD26F9 /* validationESEXT.h */; }; >+ 6EDDD1E1229F626A00AD26F9 /* validationES1.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EDDD1D7229F626900AD26F9 /* validationES1.h */; }; >+ 6EDDD1E2229F626A00AD26F9 /* validationES2_autogen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EDDD1D8229F626900AD26F9 /* validationES2_autogen.h */; }; >+ 6EDDD1E3229F626A00AD26F9 /* validationES1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6EDDD1D9229F626900AD26F9 /* validationES1.cpp */; }; >+ 6EDDD1E4229F626A00AD26F9 /* validationES31_autogen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EDDD1DA229F626A00AD26F9 /* validationES31_autogen.h */; }; >+ 6EDDD1E5229F626A00AD26F9 /* EGLSync.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EDDD1DB229F626A00AD26F9 /* EGLSync.h */; }; >+ 6EDDD1E6229F626A00AD26F9 /* EGLSync.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6EDDD1DC229F626A00AD26F9 /* EGLSync.cpp */; }; >+ 6EDDD1EA229F634F00AD26F9 /* xxhash.c in Sources */ = {isa = PBXBuildFile; fileRef = 6EDDD1E8229F634F00AD26F9 /* xxhash.c */; }; >+ 6EDDD1EB229F634F00AD26F9 /* xxhash.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EDDD1E9229F634F00AD26F9 /* xxhash.h */; }; >+ 6EDDD1EE22A041CB00AD26F9 /* BlobCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6EDDD1EC22A041CB00AD26F9 /* BlobCache.cpp */; }; >+ 6EDDD1EF22A041CB00AD26F9 /* BlobCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EDDD1ED22A041CB00AD26F9 /* BlobCache.h */; }; >+ 6EDDD1F122A0918800AD26F9 /* sha1.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6EDDD1F022A0918800AD26F9 /* sha1.cc */; }; >+ 6EDDD1F522A091BA00AD26F9 /* Context.inl.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EDDD1F222A091BA00AD26F9 /* Context.inl.h */; }; >+ 6EDDD1F622A091BA00AD26F9 /* Context_gles_1_0.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6EDDD1F322A091BA00AD26F9 /* Context_gles_1_0.cpp */; }; >+ 6EDDD1F722A091BA00AD26F9 /* Context_gles_1_0_autogen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EDDD1F422A091BA00AD26F9 /* Context_gles_1_0_autogen.h */; }; >+ 6EDDD1FE22A17E4500AD26F9 /* MemoryObjectImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EDDD1F822A17E4400AD26F9 /* MemoryObjectImpl.h */; }; >+ 6EDDD1FF22A17E4500AD26F9 /* QueryImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6EDDD1F922A17E4400AD26F9 /* QueryImpl.cpp */; }; >+ 6EDDD20022A17E4500AD26F9 /* EGLSyncImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EDDD1FA22A17E4400AD26F9 /* EGLSyncImpl.h */; }; >+ 6EDDD20122A17E4500AD26F9 /* RenderTargetCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EDDD1FB22A17E4400AD26F9 /* RenderTargetCache.h */; }; >+ 6EDDD20222A17E4500AD26F9 /* FormatID_autogen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EDDD1FC22A17E4400AD26F9 /* FormatID_autogen.h */; }; >+ 6EDDD20322A17E4500AD26F9 /* ShaderImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6EDDD1FD22A17E4500AD26F9 /* ShaderImpl.cpp */; }; >+ 6EDDD20F22A1800A00AD26F9 /* ContextCGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EDDD20622A1800900AD26F9 /* ContextCGL.h */; }; >+ 6EDDD21022A1800A00AD26F9 /* RendererCGL.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6EDDD20722A1800900AD26F9 /* RendererCGL.mm */; }; >+ 6EDDD21122A1800A00AD26F9 /* WindowSurfaceCGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EDDD20822A1800900AD26F9 /* WindowSurfaceCGL.h */; }; >+ 6EDDD21222A1800A00AD26F9 /* WindowSurfaceCGL.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6EDDD20922A1800900AD26F9 /* WindowSurfaceCGL.mm */; }; >+ 6EDDD21322A1800A00AD26F9 /* IOSurfaceSurfaceCGL.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6EDDD20A22A1800900AD26F9 /* IOSurfaceSurfaceCGL.mm */; }; >+ 6EDDD21422A1800A00AD26F9 /* IOSurfaceSurfaceCGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EDDD20B22A1800A00AD26F9 /* IOSurfaceSurfaceCGL.h */; }; >+ 6EDDD21522A1800A00AD26F9 /* ContextCGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6EDDD20C22A1800A00AD26F9 /* ContextCGL.cpp */; }; >+ 6EDDD21622A1800A00AD26F9 /* RendererCGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EDDD20D22A1800A00AD26F9 /* RendererCGL.h */; }; >+ 6EDDD21722A1800A00AD26F9 /* DisplayCGL.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6EDDD20E22A1800A00AD26F9 /* DisplayCGL.mm */; }; >+ 6EDDD21822A182DE00AD26F9 /* PbufferSurfaceCGL.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CB3014C1DE39F4700D2C405 /* PbufferSurfaceCGL.mm */; }; >+ 6EDDD21E22A1835000AD26F9 /* SystemInfo_internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EDDD21A22A1834F00AD26F9 /* SystemInfo_internal.h */; }; >+ 6EDDD21F22A1835000AD26F9 /* SystemInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EDDD21B22A1834F00AD26F9 /* SystemInfo.h */; }; >+ 6EDDD22022A1835000AD26F9 /* SystemInfo_mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6EDDD21C22A1835000AD26F9 /* SystemInfo_mac.mm */; }; >+ 6EDDD22122A1835000AD26F9 /* SystemInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6EDDD21D22A1835000AD26F9 /* SystemInfo.cpp */; }; > 72309A56183C27DE00370B93 /* Tokenizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72309A55183C27DB00370B93 /* Tokenizer.cpp */; settings = {COMPILER_FLAGS = "-Wno-unreachable-code"; }; }; > 72309A58183C27F300370B93 /* ExpressionParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72309A57183C27F100370B93 /* ExpressionParser.cpp */; settings = {COMPILER_FLAGS = "-Wno-unreachable-code"; }; }; > A08C3CDC16D6CB61003F0B83 /* ArrayBoundsClamper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A08C3CDA16D6CB61003F0B83 /* ArrayBoundsClamper.cpp */; }; >@@ -1066,11 +1120,8 @@ > 5CB301131DE39F1A00D2C405 /* VertexArrayGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VertexArrayGL.h; path = src/libANGLE/renderer/gl/VertexArrayGL.h; sourceTree = "<group>"; }; > 5CB301151DE39F1A00D2C405 /* WorkaroundsGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WorkaroundsGL.h; path = src/libANGLE/renderer/gl/WorkaroundsGL.h; sourceTree = "<group>"; }; > 5CB301491DE39F4700D2C405 /* DisplayCGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DisplayCGL.h; path = src/libANGLE/renderer/gl/cgl/DisplayCGL.h; sourceTree = "<group>"; }; >- 5CB3014A1DE39F4700D2C405 /* DisplayCGL.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = DisplayCGL.mm; path = src/libANGLE/renderer/gl/cgl/DisplayCGL.mm; sourceTree = "<group>"; }; > 5CB3014B1DE39F4700D2C405 /* PbufferSurfaceCGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PbufferSurfaceCGL.h; path = src/libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.h; sourceTree = "<group>"; }; > 5CB3014C1DE39F4700D2C405 /* PbufferSurfaceCGL.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PbufferSurfaceCGL.mm; path = src/libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.mm; sourceTree = "<group>"; }; >- 5CB3014D1DE39F4700D2C405 /* WindowSurfaceCGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WindowSurfaceCGL.h; path = src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.h; sourceTree = "<group>"; }; >- 5CB3014E1DE39F4700D2C405 /* WindowSurfaceCGL.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WindowSurfaceCGL.mm; path = src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm; sourceTree = "<group>"; }; > 5CB3048B1DE4143500D2C405 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; > 5CB3048D1DE4144400D2C405 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; > 5CB3048F1DE4145500D2C405 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; >@@ -1158,6 +1209,63 @@ > 5D7C59C51208C68B001C873E /* ANGLE.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ANGLE.xcconfig; sourceTree = "<group>"; }; > 5D7C59C61208C68B001C873E /* Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; }; > 5D7C59C71208C68B001C873E /* DebugRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DebugRelease.xcconfig; sourceTree = "<group>"; }; >+ 6EDDD1AE229F5DF600AD26F9 /* generatemip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = generatemip.h; path = src/image_util/generatemip.h; sourceTree = "<group>"; }; >+ 6EDDD1AF229F5DF600AD26F9 /* loadimage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = loadimage.cpp; path = src/image_util/loadimage.cpp; sourceTree = "<group>"; }; >+ 6EDDD1B0229F5DF600AD26F9 /* copyimage.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = copyimage.inl; path = src/image_util/copyimage.inl; sourceTree = "<group>"; }; >+ 6EDDD1B1229F5DF700AD26F9 /* copyimage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = copyimage.h; path = src/image_util/copyimage.h; sourceTree = "<group>"; }; >+ 6EDDD1B2229F5DF700AD26F9 /* loadimage.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = loadimage.inl; path = src/image_util/loadimage.inl; sourceTree = "<group>"; }; >+ 6EDDD1B3229F5DF700AD26F9 /* imageformats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = imageformats.h; path = src/image_util/imageformats.h; sourceTree = "<group>"; }; >+ 6EDDD1B4229F5DF700AD26F9 /* generatemip.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = generatemip.inl; path = src/image_util/generatemip.inl; sourceTree = "<group>"; }; >+ 6EDDD1B5229F5DF700AD26F9 /* imageformats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = imageformats.cpp; path = src/image_util/imageformats.cpp; sourceTree = "<group>"; }; >+ 6EDDD1B6229F5DF700AD26F9 /* loadimage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = loadimage.h; path = src/image_util/loadimage.h; sourceTree = "<group>"; }; >+ 6EDDD1B7229F5DF700AD26F9 /* loadimage_etc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = loadimage_etc.cpp; path = src/image_util/loadimage_etc.cpp; sourceTree = "<group>"; }; >+ 6EDDD1B8229F5DF700AD26F9 /* copyimage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = copyimage.cpp; path = src/image_util/copyimage.cpp; sourceTree = "<group>"; }; >+ 6EDDD1C1229F5FD300AD26F9 /* GLES1State.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GLES1State.cpp; path = src/libANGLE/GLES1State.cpp; sourceTree = "<group>"; }; >+ 6EDDD1C2229F5FD300AD26F9 /* GLES1Renderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GLES1Renderer.h; path = src/libANGLE/GLES1Renderer.h; sourceTree = "<group>"; }; >+ 6EDDD1C3229F5FD300AD26F9 /* GLES1Renderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GLES1Renderer.cpp; path = src/libANGLE/GLES1Renderer.cpp; sourceTree = "<group>"; }; >+ 6EDDD1C4229F5FD400AD26F9 /* GLES1State.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GLES1State.h; path = src/libANGLE/GLES1State.h; sourceTree = "<group>"; }; >+ 6EDDD1C5229F5FD400AD26F9 /* GLES1Shaders.inc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = GLES1Shaders.inc; path = src/libANGLE/GLES1Shaders.inc; sourceTree = "<group>"; }; >+ 6EDDD1CB229F617F00AD26F9 /* Observer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Observer.cpp; path = src/libANGLE/Observer.cpp; sourceTree = "<group>"; }; >+ 6EDDD1CC229F617F00AD26F9 /* MemoryObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MemoryObject.h; path = src/libANGLE/MemoryObject.h; sourceTree = "<group>"; }; >+ 6EDDD1CD229F617F00AD26F9 /* MemoryObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MemoryObject.cpp; path = src/libANGLE/MemoryObject.cpp; sourceTree = "<group>"; }; >+ 6EDDD1CE229F618000AD26F9 /* Observer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Observer.h; path = src/libANGLE/Observer.h; sourceTree = "<group>"; }; >+ 6EDDD1D3229F626800AD26F9 /* validationES3_autogen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = validationES3_autogen.h; path = src/libANGLE/validationES3_autogen.h; sourceTree = "<group>"; }; >+ 6EDDD1D4229F626900AD26F9 /* validationES1_autogen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = validationES1_autogen.h; path = src/libANGLE/validationES1_autogen.h; sourceTree = "<group>"; }; >+ 6EDDD1D5229F626900AD26F9 /* validationESEXT_autogen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = validationESEXT_autogen.h; path = src/libANGLE/validationESEXT_autogen.h; sourceTree = "<group>"; }; >+ 6EDDD1D6229F626900AD26F9 /* validationESEXT.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = validationESEXT.h; path = src/libANGLE/validationESEXT.h; sourceTree = "<group>"; }; >+ 6EDDD1D7229F626900AD26F9 /* validationES1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = validationES1.h; path = src/libANGLE/validationES1.h; sourceTree = "<group>"; }; >+ 6EDDD1D8229F626900AD26F9 /* validationES2_autogen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = validationES2_autogen.h; path = src/libANGLE/validationES2_autogen.h; sourceTree = "<group>"; }; >+ 6EDDD1D9229F626900AD26F9 /* validationES1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = validationES1.cpp; path = src/libANGLE/validationES1.cpp; sourceTree = "<group>"; }; >+ 6EDDD1DA229F626A00AD26F9 /* validationES31_autogen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = validationES31_autogen.h; path = src/libANGLE/validationES31_autogen.h; sourceTree = "<group>"; }; >+ 6EDDD1DB229F626A00AD26F9 /* EGLSync.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EGLSync.h; path = src/libANGLE/EGLSync.h; sourceTree = "<group>"; }; >+ 6EDDD1DC229F626A00AD26F9 /* EGLSync.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EGLSync.cpp; path = src/libANGLE/EGLSync.cpp; sourceTree = "<group>"; }; >+ 6EDDD1E8229F634F00AD26F9 /* xxhash.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = xxhash.c; path = src/common/third_party/xxhash/xxhash.c; sourceTree = "<group>"; }; >+ 6EDDD1E9229F634F00AD26F9 /* xxhash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = xxhash.h; path = src/common/third_party/xxhash/xxhash.h; sourceTree = "<group>"; }; >+ 6EDDD1EC22A041CB00AD26F9 /* BlobCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BlobCache.cpp; path = src/libANGLE/BlobCache.cpp; sourceTree = "<group>"; }; >+ 6EDDD1ED22A041CB00AD26F9 /* BlobCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BlobCache.h; path = src/libANGLE/BlobCache.h; sourceTree = "<group>"; }; >+ 6EDDD1F022A0918800AD26F9 /* sha1.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sha1.cc; path = src/common/third_party/base/anglebase/sha1.cc; sourceTree = "<group>"; }; >+ 6EDDD1F222A091BA00AD26F9 /* Context.inl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Context.inl.h; path = src/libANGLE/Context.inl.h; sourceTree = "<group>"; }; >+ 6EDDD1F322A091BA00AD26F9 /* Context_gles_1_0.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Context_gles_1_0.cpp; path = src/libANGLE/Context_gles_1_0.cpp; sourceTree = "<group>"; }; >+ 6EDDD1F422A091BA00AD26F9 /* Context_gles_1_0_autogen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Context_gles_1_0_autogen.h; path = src/libANGLE/Context_gles_1_0_autogen.h; sourceTree = "<group>"; }; >+ 6EDDD1F822A17E4400AD26F9 /* MemoryObjectImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MemoryObjectImpl.h; path = src/libANGLE/renderer/MemoryObjectImpl.h; sourceTree = "<group>"; }; >+ 6EDDD1F922A17E4400AD26F9 /* QueryImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = QueryImpl.cpp; path = src/libANGLE/renderer/QueryImpl.cpp; sourceTree = "<group>"; }; >+ 6EDDD1FA22A17E4400AD26F9 /* EGLSyncImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EGLSyncImpl.h; path = src/libANGLE/renderer/EGLSyncImpl.h; sourceTree = "<group>"; }; >+ 6EDDD1FB22A17E4400AD26F9 /* RenderTargetCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RenderTargetCache.h; path = src/libANGLE/renderer/RenderTargetCache.h; sourceTree = "<group>"; }; >+ 6EDDD1FC22A17E4400AD26F9 /* FormatID_autogen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FormatID_autogen.h; path = src/libANGLE/renderer/FormatID_autogen.h; sourceTree = "<group>"; }; >+ 6EDDD1FD22A17E4500AD26F9 /* ShaderImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ShaderImpl.cpp; path = src/libANGLE/renderer/ShaderImpl.cpp; sourceTree = "<group>"; }; >+ 6EDDD20622A1800900AD26F9 /* ContextCGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ContextCGL.h; path = src/libANGLE/renderer/gl/cgl/ContextCGL.h; sourceTree = "<group>"; }; >+ 6EDDD20722A1800900AD26F9 /* RendererCGL.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = RendererCGL.mm; path = src/libANGLE/renderer/gl/cgl/RendererCGL.mm; sourceTree = "<group>"; }; >+ 6EDDD20822A1800900AD26F9 /* WindowSurfaceCGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WindowSurfaceCGL.h; path = src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.h; sourceTree = "<group>"; }; >+ 6EDDD20922A1800900AD26F9 /* WindowSurfaceCGL.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WindowSurfaceCGL.mm; path = src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm; sourceTree = "<group>"; }; >+ 6EDDD20A22A1800900AD26F9 /* IOSurfaceSurfaceCGL.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = IOSurfaceSurfaceCGL.mm; path = src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.mm; sourceTree = "<group>"; }; >+ 6EDDD20B22A1800A00AD26F9 /* IOSurfaceSurfaceCGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IOSurfaceSurfaceCGL.h; path = src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.h; sourceTree = "<group>"; }; >+ 6EDDD20C22A1800A00AD26F9 /* ContextCGL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ContextCGL.cpp; path = src/libANGLE/renderer/gl/cgl/ContextCGL.cpp; sourceTree = "<group>"; }; >+ 6EDDD20D22A1800A00AD26F9 /* RendererCGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RendererCGL.h; path = src/libANGLE/renderer/gl/cgl/RendererCGL.h; sourceTree = "<group>"; }; >+ 6EDDD20E22A1800A00AD26F9 /* DisplayCGL.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = DisplayCGL.mm; path = src/libANGLE/renderer/gl/cgl/DisplayCGL.mm; sourceTree = "<group>"; }; >+ 6EDDD21A22A1834F00AD26F9 /* SystemInfo_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SystemInfo_internal.h; path = src/gpu_info_util/SystemInfo_internal.h; sourceTree = "<group>"; }; >+ 6EDDD21B22A1834F00AD26F9 /* SystemInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SystemInfo.h; path = src/gpu_info_util/SystemInfo.h; sourceTree = "<group>"; }; >+ 6EDDD21C22A1835000AD26F9 /* SystemInfo_mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SystemInfo_mac.mm; path = src/gpu_info_util/SystemInfo_mac.mm; sourceTree = "<group>"; }; >+ 6EDDD21D22A1835000AD26F9 /* SystemInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SystemInfo.cpp; path = src/gpu_info_util/SystemInfo.cpp; sourceTree = "<group>"; }; > 72309A55183C27DB00370B93 /* Tokenizer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Tokenizer.cpp; sourceTree = "<group>"; }; > 72309A57183C27F100370B93 /* ExpressionParser.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ExpressionParser.cpp; sourceTree = "<group>"; }; > A08C3CDA16D6CB61003F0B83 /* ArrayBoundsClamper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ArrayBoundsClamper.cpp; path = src/third_party/compiler/ArrayBoundsClamper.cpp; sourceTree = "<group>"; }; >@@ -1358,6 +1466,7 @@ > children = ( > 315EBE0E1FCE45DF00AC7A89 /* base */, > 315EBE251FCF806A00AC7A89 /* smhasher */, >+ 6EDDD1E7229F630500AD26F9 /* xxhash */, > ); > name = third_party; > sourceTree = "<group>"; >@@ -1377,6 +1486,7 @@ > 315EBE131FCE460700AC7A89 /* base_export.h */, > 315EBE141FCE460700AC7A89 /* logging.h */, > 315EBE111FCE460700AC7A89 /* macros.h */, >+ 6EDDD1F022A0918800AD26F9 /* sha1.cc */, > 315EBE121FCE460700AC7A89 /* sha1.h */, > 315EBE151FCE460800AC7A89 /* sys_byteorder.h */, > ); >@@ -1460,6 +1570,8 @@ > 5C1DBC4A1B0438D200235552 /* AttributeMap.cpp */, > 5C1DBC4B1B0438D200235552 /* AttributeMap.h */, > 5C1DBC4C1B0438D200235552 /* BinaryStream.h */, >+ 6EDDD1EC22A041CB00AD26F9 /* BlobCache.cpp */, >+ 6EDDD1ED22A041CB00AD26F9 /* BlobCache.h */, > 5C1DBC4D1B0438D200235552 /* Buffer.cpp */, > 5C1DBC4E1B0438D200235552 /* Buffer.h */, > 5C1DBC4F1B0438D200235552 /* Caps.cpp */, >@@ -1477,6 +1589,8 @@ > 5C1DBC5C1B0438D200235552 /* Device.h */, > 5C1DBC5D1B0438D200235552 /* Display.cpp */, > 5C1DBC5E1B0438D200235552 /* Display.h */, >+ 6EDDD1DC229F626A00AD26F9 /* EGLSync.cpp */, >+ 6EDDD1DB229F626A00AD26F9 /* EGLSync.h */, > 5C1DBC5F1B0438D200235552 /* Error.cpp */, > 5C1DBC601B0438D200235552 /* Error.h */, > 5C1DBC611B0438D200235552 /* Error.inl */, >@@ -1492,6 +1606,11 @@ > 5C1DBC6B1B0438D200235552 /* Framebuffer.h */, > 5C1DBC6C1B0438D200235552 /* FramebufferAttachment.cpp */, > 5C1DBC6D1B0438D200235552 /* FramebufferAttachment.h */, >+ 6EDDD1C3229F5FD300AD26F9 /* GLES1Renderer.cpp */, >+ 6EDDD1C2229F5FD300AD26F9 /* GLES1Renderer.h */, >+ 6EDDD1C5229F5FD400AD26F9 /* GLES1Shaders.inc */, >+ 6EDDD1C1229F5FD300AD26F9 /* GLES1State.cpp */, >+ 6EDDD1C4229F5FD400AD26F9 /* GLES1State.h */, > 5C1DBC6F1B0438D200235552 /* HandleAllocator.cpp */, > 5C1DBC701B0438D200235552 /* HandleAllocator.h */, > 5CCD815C1DBFE999006066B8 /* HandleRangeAllocator.cpp */, >@@ -1551,12 +1670,20 @@ > 5C1DBDC81B0438D300235552 /* validationEGL.h */, > 5C1DBDC91B0438D300235552 /* validationES.cpp */, > 5C1DBDCA1B0438D300235552 /* validationES.h */, >+ 6EDDD1D9229F626900AD26F9 /* validationES1.cpp */, >+ 6EDDD1D7229F626900AD26F9 /* validationES1.h */, >+ 6EDDD1D4229F626900AD26F9 /* validationES1_autogen.h */, > 5C1DBDCB1B0438D300235552 /* validationES2.cpp */, > 5C1DBDCC1B0438D300235552 /* validationES2.h */, >+ 6EDDD1D8229F626900AD26F9 /* validationES2_autogen.h */, > 5C1DBDCD1B0438D300235552 /* validationES3.cpp */, > 5C1DBDCE1B0438D300235552 /* validationES3.h */, > 5CCD816A1DBFE999006066B8 /* validationES31.cpp */, > 5CCD816B1DBFE999006066B8 /* validationES31.h */, >+ 6EDDD1DA229F626A00AD26F9 /* validationES31_autogen.h */, >+ 6EDDD1D3229F626800AD26F9 /* validationES3_autogen.h */, >+ 6EDDD1D6229F626900AD26F9 /* validationESEXT.h */, >+ 6EDDD1D5229F626900AD26F9 /* validationESEXT_autogen.h */, > 315EBDDF1FCE452C00AC7A89 /* VaryingPacking.cpp */, > 315EBDDE1FCE452C00AC7A89 /* VaryingPacking.h */, > 5CCD816C1DBFE999006066B8 /* Version.h */, >@@ -1643,9 +1770,11 @@ > 315EBDC71FCE44E300AC7A89 /* driver_utils.cpp */, > 315EBDC41FCE44E200AC7A89 /* driver_utils.h */, > 5CB304B31DE4164800D2C405 /* EGLImplFactory.h */, >+ 6EDDD1FA22A17E4400AD26F9 /* EGLSyncImpl.h */, > 5CB304B41DE4164800D2C405 /* FenceNVImpl.h */, > 5CB304B91DE4164800D2C405 /* Format.h */, > 315EBDC51FCE44E300AC7A89 /* Format_table_autogen.cpp */, >+ 6EDDD1FC22A17E4400AD26F9 /* FormatID_autogen.h */, > 5CB304BA1DE4164800D2C405 /* FramebufferAttachmentObjectImpl.h */, > 5CB304BC1DE4164800D2C405 /* FramebufferImpl.h */, > 5CB304BB1DE4164800D2C405 /* FramebufferImpl_mock.h */, >@@ -1654,16 +1783,24 @@ > 5CB304C11DE4164800D2C405 /* ImageImpl_mock.h */, > 5CB304C51DE4164800D2C405 /* load_functions_table.h */, > 5CB304C41DE4164800D2C405 /* load_functions_table_autogen.cpp */, >+ 6EDDD1CD229F617F00AD26F9 /* MemoryObject.cpp */, >+ 6EDDD1CC229F617F00AD26F9 /* MemoryObject.h */, >+ 6EDDD1F822A17E4400AD26F9 /* MemoryObjectImpl.h */, >+ 6EDDD1CB229F617F00AD26F9 /* Observer.cpp */, >+ 6EDDD1CE229F618000AD26F9 /* Observer.h */, > 5CB304C71DE4164800D2C405 /* PathImpl.h */, > 5CB304C91DE4164800D2C405 /* ProgramImpl.h */, > 5CB304C81DE4164800D2C405 /* ProgramImpl_mock.h */, > 315EBDC31FCE44E200AC7A89 /* ProgramPipelineImpl.h */, >+ 6EDDD1F922A17E4400AD26F9 /* QueryImpl.cpp */, > 5CB304CA1DE4164800D2C405 /* QueryImpl.h */, > 5CB304CC1DE4164800D2C405 /* RenderbufferImpl.h */, > 5CB304CB1DE4164800D2C405 /* RenderbufferImpl_mock.h */, > 5CB304CD1DE4164800D2C405 /* renderer_utils.cpp */, > 5CB304CE1DE4164800D2C405 /* renderer_utils.h */, >+ 6EDDD1FB22A17E4400AD26F9 /* RenderTargetCache.h */, > 5CB304CF1DE4164800D2C405 /* SamplerImpl.h */, >+ 6EDDD1FD22A17E4500AD26F9 /* ShaderImpl.cpp */, > 5CB304D01DE4164800D2C405 /* ShaderImpl.h */, > 5CB304D11DE4164800D2C405 /* StreamProducerImpl.h */, > 5CB304D21DE4164800D2C405 /* SurfaceImpl.cpp */, >@@ -1691,6 +1828,9 @@ > 315EBDB71FCE44BF00AC7A89 /* ClearMultiviewGL.h */, > 5CB300E51DE39F1A00D2C405 /* CompilerGL.cpp */, > 5CB300E61DE39F1A00D2C405 /* CompilerGL.h */, >+ 6EDDD1F222A091BA00AD26F9 /* Context.inl.h */, >+ 6EDDD1F322A091BA00AD26F9 /* Context_gles_1_0.cpp */, >+ 6EDDD1F422A091BA00AD26F9 /* Context_gles_1_0_autogen.h */, > 5CB300E71DE39F1A00D2C405 /* ContextGL.cpp */, > 5CB300E81DE39F1A00D2C405 /* ContextGL.h */, > 315EBDB41FCE44BE00AC7A89 /* DispatchTableGL_autogen.cpp */, >@@ -1748,12 +1888,18 @@ > 5CB301481DE39F3600D2C405 /* cgl */ = { > isa = PBXGroup; > children = ( >+ 6EDDD20C22A1800A00AD26F9 /* ContextCGL.cpp */, >+ 6EDDD20622A1800900AD26F9 /* ContextCGL.h */, > 5CB301491DE39F4700D2C405 /* DisplayCGL.h */, >- 5CB3014A1DE39F4700D2C405 /* DisplayCGL.mm */, >+ 6EDDD20E22A1800A00AD26F9 /* DisplayCGL.mm */, >+ 6EDDD20B22A1800A00AD26F9 /* IOSurfaceSurfaceCGL.h */, >+ 6EDDD20A22A1800900AD26F9 /* IOSurfaceSurfaceCGL.mm */, > 5CB3014B1DE39F4700D2C405 /* PbufferSurfaceCGL.h */, > 5CB3014C1DE39F4700D2C405 /* PbufferSurfaceCGL.mm */, >- 5CB3014D1DE39F4700D2C405 /* WindowSurfaceCGL.h */, >- 5CB3014E1DE39F4700D2C405 /* WindowSurfaceCGL.mm */, >+ 6EDDD20D22A1800A00AD26F9 /* RendererCGL.h */, >+ 6EDDD20722A1800900AD26F9 /* RendererCGL.mm */, >+ 6EDDD20822A1800900AD26F9 /* WindowSurfaceCGL.h */, >+ 6EDDD20922A1800900AD26F9 /* WindowSurfaceCGL.mm */, > ); > name = cgl; > sourceTree = "<group>"; >@@ -1932,6 +2078,44 @@ > path = Configurations; > sourceTree = "<group>"; > }; >+ 6EDDD1AD229F5DBD00AD26F9 /* image_util */ = { >+ isa = PBXGroup; >+ children = ( >+ 6EDDD1B8229F5DF700AD26F9 /* copyimage.cpp */, >+ 6EDDD1B1229F5DF700AD26F9 /* copyimage.h */, >+ 6EDDD1B0229F5DF600AD26F9 /* copyimage.inl */, >+ 6EDDD1AE229F5DF600AD26F9 /* generatemip.h */, >+ 6EDDD1B4229F5DF700AD26F9 /* generatemip.inl */, >+ 6EDDD1B5229F5DF700AD26F9 /* imageformats.cpp */, >+ 6EDDD1B3229F5DF700AD26F9 /* imageformats.h */, >+ 6EDDD1AF229F5DF600AD26F9 /* loadimage.cpp */, >+ 6EDDD1B6229F5DF700AD26F9 /* loadimage.h */, >+ 6EDDD1B2229F5DF700AD26F9 /* loadimage.inl */, >+ 6EDDD1B7229F5DF700AD26F9 /* loadimage_etc.cpp */, >+ ); >+ name = image_util; >+ sourceTree = "<group>"; >+ }; >+ 6EDDD1E7229F630500AD26F9 /* xxhash */ = { >+ isa = PBXGroup; >+ children = ( >+ 6EDDD1E8229F634F00AD26F9 /* xxhash.c */, >+ 6EDDD1E9229F634F00AD26F9 /* xxhash.h */, >+ ); >+ name = xxhash; >+ sourceTree = "<group>"; >+ }; >+ 6EDDD21922A1831300AD26F9 /* gpu_info_util */ = { >+ isa = PBXGroup; >+ children = ( >+ 6EDDD21D22A1835000AD26F9 /* SystemInfo.cpp */, >+ 6EDDD21B22A1834F00AD26F9 /* SystemInfo.h */, >+ 6EDDD21A22A1834F00AD26F9 /* SystemInfo_internal.h */, >+ 6EDDD21C22A1835000AD26F9 /* SystemInfo_mac.mm */, >+ ); >+ name = gpu_info_util; >+ sourceTree = "<group>"; >+ }; > A08C3CD816D6CB35003F0B83 /* third_party */ = { > isa = PBXGroup; > children = ( >@@ -1989,6 +2173,8 @@ > children = ( > 5CC7D45919102608000B8C1F /* common */, > FB39D2201200F35A00088E69 /* compiler */, >+ 6EDDD21922A1831300AD26F9 /* gpu_info_util */, >+ 6EDDD1AD229F5DBD00AD26F9 /* image_util */, > 5C1DBC471B0438B700235552 /* libANGLE */, > 5CB300B41DE39E5400D2C405 /* libEGL */, > 5CB300DD1DE39E8800D2C405 /* libGLESv2 */, >@@ -2077,6 +2263,7 @@ > 5C1DBDD71B0438D300235552 /* BinaryStream.h in Headers */, > 31A331C21EA5ED2500FD2203 /* bitset_utils.h in Headers */, > 5CB301171DE39F1A00D2C405 /* BlitGL.h in Headers */, >+ 6EDDD1EF22A041CB00AD26F9 /* BlobCache.h in Headers */, > 5C1DBC251B04375F00235552 /* blocklayout.h in Headers */, > 5C1DBC271B04375F00235552 /* blocklayoutHLSL.h in Headers */, > 5C55D65422826B9F00B5BA2C /* BreakVariableAliasingInInnerLoops.h in Headers */, >@@ -2102,8 +2289,12 @@ > 5C1DBDE11B0438D300235552 /* Constants.h in Headers */, > 31012E1A18B97B9B0039062F /* ConstantUnion.h in Headers */, > 5C1DBDE31B0438D300235552 /* Context.h in Headers */, >+ 6EDDD1F522A091BA00AD26F9 /* Context.inl.h in Headers */, >+ 6EDDD1F722A091BA00AD26F9 /* Context_gles_1_0_autogen.h in Headers */, >+ 6EDDD20F22A1800A00AD26F9 /* ContextCGL.h in Headers */, > 5CB3011D1DE39F1A00D2C405 /* ContextGL.h in Headers */, > 5CB304DE1DE4164800D2C405 /* ContextImpl.h in Headers */, >+ 6EDDD1BB229F5DF700AD26F9 /* copyimage.h in Headers */, > 5CCD81731DBFE999006066B8 /* Debug.h in Headers */, > 5CC7D46F19102621000B8C1F /* debug.h in Headers */, > 5C55D734228274DE00B5BA2C /* Declarator.h in Headers */, >@@ -2126,6 +2317,8 @@ > 5C1BAAAB1DFB6124002906BB /* eglext.h in Headers */, > 5CB304E31DE4164800D2C405 /* EGLImplFactory.h in Headers */, > 5C1BAAAC1DFB6124002906BB /* eglplatform.h in Headers */, >+ 6EDDD1E5229F626A00AD26F9 /* EGLSync.h in Headers */, >+ 6EDDD20022A17E4500AD26F9 /* EGLSyncImpl.h in Headers */, > 5C55D65222826B9F00B5BA2C /* EmulateGLDrawID.h in Headers */, > 5C55D66A22826B9F00B5BA2C /* EmulateGLFragColorBroadcast.h in Headers */, > 5C55D6A322826B9F00B5BA2C /* EmulatePrecision.h in Headers */, >@@ -2153,6 +2346,7 @@ > 5C9FFF4F19102A000025B8FA /* FlagStd140Structs.h in Headers */, > 5C55D6A422826B9F00B5BA2C /* FoldExpressions.h in Headers */, > 5CB304E81DE4164800D2C405 /* Format.h in Headers */, >+ 6EDDD20222A17E4500AD26F9 /* FormatID_autogen.h in Headers */, > 5C1DBDF21B0438D300235552 /* formatutils.h in Headers */, > 5CB301261DE39F1A00D2C405 /* formatutilsgl.h in Headers */, > 5C1DBDF41B0438D300235552 /* Framebuffer.h in Headers */, >@@ -2165,6 +2359,7 @@ > 5CB3012C1DE39F1A00D2C405 /* FunctionsGL.h in Headers */, > 5CB301291DE39F1A00D2C405 /* functionsgl_enums.h in Headers */, > 5CB3012A1DE39F1A00D2C405 /* functionsgl_typedefs.h in Headers */, >+ 6EDDD1B9229F5DF700AD26F9 /* generatemip.h in Headers */, > 5C1BAAA21DFB610E002906BB /* gl2.h in Headers */, > 5C1BAAA31DFB610E002906BB /* gl2ext.h in Headers */, > 5C1BAAA41DFB610E002906BB /* gl2platform.h in Headers */, >@@ -2172,6 +2367,8 @@ > 5C1BAA9C1DFB60FF002906BB /* gl31.h in Headers */, > 5C1BAA9D1DFB60FF002906BB /* gl32.h in Headers */, > 5C1BAA9B1DFB60FF002906BB /* gl3platform.h in Headers */, >+ 6EDDD1C7229F5FD400AD26F9 /* GLES1Renderer.h in Headers */, >+ 6EDDD1C9229F5FD400AD26F9 /* GLES1State.h in Headers */, > 5CB304EC1DE4164800D2C405 /* GLImplFactory.h in Headers */, > 5CB304A21DE4157B00D2C405 /* global_state.h in Headers */, > 31012E2D18B97B9B0039062F /* glslang.h in Headers */, >@@ -2182,6 +2379,7 @@ > 31012E3318B97B9B0039062F /* HashNames.h in Headers */, > 5C1DBDFA1B0438D300235552 /* histogram_macros.h in Headers */, > 5CCD81771DBFE999006066B8 /* Image.h in Headers */, >+ 6EDDD1BC229F5DF700AD26F9 /* imageformats.h in Headers */, > 315EBD961FCE443600AC7A89 /* ImageFunctionHLSL.h in Headers */, > 5CB304EE1DE4164800D2C405 /* ImageImpl.h in Headers */, > 5CB304ED1DE4164800D2C405 /* ImageImpl_mock.h in Headers */, >@@ -2199,11 +2397,13 @@ > 5C55D6FE22826CB300B5BA2C /* IntermNode_util.h in Headers */, > 5C55D70822826CB300B5BA2C /* IntermNodePatternMatcher.h in Headers */, > 5C55D70122826CB300B5BA2C /* IntermTraverse.h in Headers */, >+ 6EDDD21422A1800A00AD26F9 /* IOSurfaceSurfaceCGL.h in Headers */, > 315EBD8E1FCE443600AC7A89 /* IsASTDepthBelowLimit.h in Headers */, > A264F8CD169762AA006FAA5A /* khrplatform.h in Headers */, > 5C1DBC321B04375F00235552 /* length_limits.h in Headers */, > A264F8B716974DED006FAA5A /* Lexer.h in Headers */, > 5CB304F01DE4164800D2C405 /* load_functions_table.h in Headers */, >+ 6EDDD1BE229F5DF700AD26F9 /* loadimage.h in Headers */, > 315EBE1A1FCE460800AC7A89 /* logging.h in Headers */, > 315EBDF11FCE452D00AC7A89 /* LoggingAnnotator.h in Headers */, > A264F8B916974DED006FAA5A /* Macro.h in Headers */, >@@ -2212,11 +2412,14 @@ > 5CC7D47319102621000B8C1F /* mathutil.h in Headers */, > 5CCD81901DBFEA10006066B8 /* matrix_utils.h in Headers */, > 5C1DBBF21B0436EC00235552 /* MemoryBuffer.h in Headers */, >+ 6EDDD1D0229F618000AD26F9 /* MemoryObject.h in Headers */, >+ 6EDDD1FE22A17E4500AD26F9 /* MemoryObjectImpl.h in Headers */, > 315EBDED1FCE452D00AC7A89 /* MemoryProgramCache.h in Headers */, > 5C55D66922826B9F00B5BA2C /* NameEmbeddedUniformStructs.h in Headers */, > 5C55D70722826CB300B5BA2C /* NodeSearch.h in Headers */, > 315EBDC21FCE44BF00AC7A89 /* null_functions.h in Headers */, > A264F8BC16974DED006FAA5A /* numeric_lex.h in Headers */, >+ 6EDDD1D2229F618000AD26F9 /* Observer.h in Headers */, > 5C1DBC341B04375F00235552 /* Operator.h in Headers */, > 5C1DBBF41B0436EC00235552 /* Optional.h in Headers */, > 31012E4C18B97B9B0039062F /* OutputESSL.h in Headers */, >@@ -2270,8 +2473,10 @@ > 5CB304F61DE4164800D2C405 /* RenderbufferImpl.h in Headers */, > 5CB304F51DE4164800D2C405 /* RenderbufferImpl_mock.h in Headers */, > 5CB304F81DE4164800D2C405 /* renderer_utils.h in Headers */, >+ 6EDDD21622A1800A00AD26F9 /* RendererCGL.h in Headers */, > 5CB301381DE39F1A00D2C405 /* RendererGL.h in Headers */, > 5CB301361DE39F1A00D2C405 /* renderergl_utils.h in Headers */, >+ 6EDDD20122A17E4500AD26F9 /* RenderTargetCache.h in Headers */, > 5C55D70522826CB300B5BA2C /* ReplaceVariable.h in Headers */, > 5CB304A61DE4157E00D2C405 /* resource.h in Headers */, > 5CB304A41DE4157B00D2C405 /* resource.h in Headers */, >@@ -2328,6 +2533,8 @@ > 315EBE1B1FCE460800AC7A89 /* sys_byteorder.h in Headers */, > 31A331C71EA5ED5F00FD2203 /* system_utils.h in Headers */, > 5C55D72B2282747700B5BA2C /* system_utils_unittest_helper.h in Headers */, >+ 6EDDD21F22A1835000AD26F9 /* SystemInfo.h in Headers */, >+ 6EDDD21E22A1835000AD26F9 /* SystemInfo_internal.h in Headers */, > 5C1DBF311B0438D300235552 /* Texture.h in Headers */, > 315EBD9E1FCE443600AC7A89 /* TextureFunctionHLSL.h in Headers */, > 5CB301421DE39F1A00D2C405 /* TextureGL.h in Headers */, >@@ -2363,9 +2570,16 @@ > 315EBDA71FCE443600AC7A89 /* ValidateVaryingLocations.h in Headers */, > 5C1DBF381B0438D300235552 /* validationEGL.h in Headers */, > 5C1DBF3A1B0438D300235552 /* validationES.h in Headers */, >+ 6EDDD1E1229F626A00AD26F9 /* validationES1.h in Headers */, >+ 6EDDD1DE229F626A00AD26F9 /* validationES1_autogen.h in Headers */, > 5C1DBF3C1B0438D300235552 /* validationES2.h in Headers */, >+ 6EDDD1E2229F626A00AD26F9 /* validationES2_autogen.h in Headers */, > 5C1DBF3E1B0438D300235552 /* validationES3.h in Headers */, > 5CCD81831DBFE999006066B8 /* validationES31.h in Headers */, >+ 6EDDD1E4229F626A00AD26F9 /* validationES31_autogen.h in Headers */, >+ 6EDDD1DD229F626A00AD26F9 /* validationES3_autogen.h in Headers */, >+ 6EDDD1E0229F626A00AD26F9 /* validationESEXT.h in Headers */, >+ 6EDDD1DF229F626A00AD26F9 /* validationESEXT_autogen.h in Headers */, > 31012E7E18B97B9B0039062F /* VariablePacker.h in Headers */, > 315EBDF51FCE452D00AC7A89 /* VaryingPacking.h in Headers */, > 31A331C81EA5ED5F00FD2203 /* vector_utils.h in Headers */, >@@ -2378,11 +2592,12 @@ > 5CB305031DE4164800D2C405 /* VertexArrayImpl.h in Headers */, > 5C1DBF421B0438D300235552 /* VertexAttribute.h in Headers */, > 5C55D70022826CB300B5BA2C /* Visit.h in Headers */, >- 5CB301531DE39F4700D2C405 /* WindowSurfaceCGL.h in Headers */, >+ 6EDDD21122A1800A00AD26F9 /* WindowSurfaceCGL.h in Headers */, > 5CCD81851DBFE999006066B8 /* Workarounds.h in Headers */, > 5CB301471DE39F1A00D2C405 /* WorkaroundsGL.h in Headers */, > 315EBDFA1FCE452D00AC7A89 /* WorkerThread.h in Headers */, > 5C55D67522826B9F00B5BA2C /* WrapSwitchStatementsInBlocks.h in Headers */, >+ 6EDDD1EB229F634F00AD26F9 /* xxhash.h in Headers */, > ); > runOnlyForDeploymentPostprocessing = 0; > }; >@@ -2398,6 +2613,7 @@ > FB39D0CF1200F0E300088E69 /* Frameworks */, > 312BDB0B15FECAB00097EBC7 /* CopyFiles */, > 312BDB0D15FECACE0097EBC7 /* CopyFiles */, >+ 6E28B8742294DD8000717E69 /* ShellScript */, > ); > buildRules = ( > ); >@@ -2436,6 +2652,26 @@ > }; > /* End PBXProject section */ > >+/* Begin PBXShellScriptBuildPhase section */ >+ 6E28B8742294DD8000717E69 /* ShellScript */ = { >+ isa = PBXShellScriptBuildPhase; >+ buildActionMask = 2147483647; >+ files = ( >+ ); >+ inputFileListPaths = ( >+ ); >+ inputPaths = ( >+ ); >+ outputFileListPaths = ( >+ ); >+ outputPaths = ( >+ ); >+ runOnlyForDeploymentPostprocessing = 0; >+ shellPath = /bin/sh; >+ shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n/bin/sh $SRCROOT/adjust-angle-include-paths.sh\n"; >+ }; >+/* End PBXShellScriptBuildPhase section */ >+ > /* Begin PBXSourcesBuildPhase section */ > FB39D0CE1200F0E300088E69 /* Sources */ = { > isa = PBXSourcesBuildPhase; >@@ -2451,6 +2687,7 @@ > 5C1DBC221B04375F00235552 /* ASTMetadataHLSL.cpp in Sources */, > 5C1DBDD51B0438D300235552 /* AttributeMap.cpp in Sources */, > 5CB301161DE39F1A00D2C405 /* BlitGL.cpp in Sources */, >+ 6EDDD1EE22A041CB00AD26F9 /* BlobCache.cpp in Sources */, > 5C1DBC241B04375F00235552 /* blocklayout.cpp in Sources */, > 5C1DBC261B04375F00235552 /* blocklayoutHLSL.cpp in Sources */, > 5C55D6AB22826BC800B5BA2C /* BreakVariableAliasingInInnerLoops.cpp in Sources */, >@@ -2472,8 +2709,11 @@ > 5C1DBDDF1B0438D300235552 /* Config.cpp in Sources */, > 5CCD81B01DBFEA5C006066B8 /* ConstantUnion.cpp in Sources */, > 5C1DBDE21B0438D300235552 /* Context.cpp in Sources */, >+ 6EDDD1F622A091BA00AD26F9 /* Context_gles_1_0.cpp in Sources */, >+ 6EDDD21522A1800A00AD26F9 /* ContextCGL.cpp in Sources */, > 5CB3011C1DE39F1A00D2C405 /* ContextGL.cpp in Sources */, > 5CB304DD1DE4164800D2C405 /* ContextImpl.cpp in Sources */, >+ 6EDDD1C0229F5DF700AD26F9 /* copyimage.cpp in Sources */, > 5CCD81721DBFE999006066B8 /* Debug.cpp in Sources */, > 5CC7D46E19102621000B8C1F /* debug.cpp in Sources */, > 5C55D733228274DE00B5BA2C /* Declarator.cpp in Sources */, >@@ -2488,9 +2728,11 @@ > A264F8B016974DED006FAA5A /* DirectiveParser.cpp in Sources */, > 315EBDBE1FCE44BF00AC7A89 /* DispatchTableGL_autogen.cpp in Sources */, > 5C1DBDE81B0438D300235552 /* Display.cpp in Sources */, >+ 6EDDD21722A1800A00AD26F9 /* DisplayCGL.mm in Sources */, > 5CB3011E1DE39F1A00D2C405 /* DisplayGL.cpp in Sources */, > 5CB304E11DE4164800D2C405 /* DisplayImpl.cpp in Sources */, > 315EBDCC1FCE44E400AC7A89 /* driver_utils.cpp in Sources */, >+ 6EDDD1E6229F626A00AD26F9 /* EGLSync.cpp in Sources */, > 315EBD971FCE443600AC7A89 /* emulated_builtin_functions_hlsl_autogen.cpp in Sources */, > 5C55D6B022826BC800B5BA2C /* EmulateGLDrawID.cpp in Sources */, > 5C55D6B122826BC800B5BA2C /* EmulateGLFragColorBroadcast.cpp in Sources */, >@@ -2523,6 +2765,9 @@ > 5CB301271DE39F1A00D2C405 /* FramebufferGL.cpp in Sources */, > 5C55D6E422826C7900B5BA2C /* FunctionLookup.cpp in Sources */, > 5CB3012B1DE39F1A00D2C405 /* FunctionsGL.cpp in Sources */, >+ 6EDDD1C8229F5FD400AD26F9 /* GLES1Renderer.cpp in Sources */, >+ 6EDDD1CA229F5FD400AD26F9 /* GLES1Shaders.inc in Sources */, >+ 6EDDD1C6229F5FD400AD26F9 /* GLES1State.cpp in Sources */, > 5C1BAAB11DFB6F33002906BB /* global_state.cpp in Sources */, > 31012E3018B97B9B0039062F /* glslang_lex.cpp in Sources */, > 31012E3118B97B9B0039062F /* glslang_tab.cpp in Sources */, >@@ -2530,6 +2775,7 @@ > 5CCD81741DBFE999006066B8 /* HandleRangeAllocator.cpp in Sources */, > 315EBD861FCE443600AC7A89 /* HashNames.cpp in Sources */, > 5CCD81761DBFE999006066B8 /* Image.cpp in Sources */, >+ 6EDDD1BD229F5DF700AD26F9 /* imageformats.cpp in Sources */, > 315EBD831FCE443600AC7A89 /* ImageFunctionHLSL.cpp in Sources */, > 5C1DBDFB1B0438D300235552 /* ImageIndex.cpp in Sources */, > 5C55D6E022826C7900B5BA2C /* ImmutableString.cpp in Sources */, >@@ -2544,19 +2790,24 @@ > 5C55D70922826CB300B5BA2C /* IntermNode_util.cpp in Sources */, > 5C55D70422826CB300B5BA2C /* IntermNodePatternMatcher.cpp in Sources */, > 5C55D70222826CB300B5BA2C /* IntermTraverse.cpp in Sources */, >+ 6EDDD21322A1800A00AD26F9 /* IOSurfaceSurfaceCGL.mm in Sources */, > 315EBD9C1FCE443600AC7A89 /* IsASTDepthBelowLimit.cpp in Sources */, > A264F8B616974DED006FAA5A /* Lexer.cpp in Sources */, > 5CB5E1A71DFB8AF600F90FC9 /* libEGL.cpp in Sources */, > 5CB304EF1DE4164800D2C405 /* load_functions_table_autogen.cpp in Sources */, >+ 6EDDD1BA229F5DF700AD26F9 /* loadimage.cpp in Sources */, >+ 6EDDD1BF229F5DF700AD26F9 /* loadimage_etc.cpp in Sources */, > 315EBDE81FCE452D00AC7A89 /* LoggingAnnotator.cpp in Sources */, > A264F8B816974DED006FAA5A /* Macro.cpp in Sources */, > A264F8BA16974DED006FAA5A /* MacroExpander.cpp in Sources */, > 5CC7D47219102621000B8C1F /* mathutil.cpp in Sources */, > 5C55D7252282747700B5BA2C /* matrix_utils.cpp in Sources */, > 5C1DBBF11B0436EC00235552 /* MemoryBuffer.cpp in Sources */, >+ 6EDDD1D1229F618000AD26F9 /* MemoryObject.cpp in Sources */, > 315EBDF31FCE452D00AC7A89 /* MemoryProgramCache.cpp in Sources */, > 5C55D6B622826BC800B5BA2C /* NameEmbeddedUniformStructs.cpp in Sources */, > 315EBDBF1FCE44BF00AC7A89 /* null_functions.cpp in Sources */, >+ 6EDDD1CF229F618000AD26F9 /* Observer.cpp in Sources */, > 5C1DBC331B04375F00235552 /* Operator.cpp in Sources */, > 31012E4B18B97B9B0039062F /* OutputESSL.cpp in Sources */, > 31012E4D18B97B9B0039062F /* OutputGLSL.cpp in Sources */, >@@ -2570,6 +2821,7 @@ > 31012E5418B97B9B0039062F /* ParseContext.cpp in Sources */, > 5CCD817A1DBFE999006066B8 /* Path.cpp in Sources */, > 5CB3012D1DE39F1A00D2C405 /* PathGL.cpp in Sources */, >+ 6EDDD21822A182DE00AD26F9 /* PbufferSurfaceCGL.mm in Sources */, > 5C1DBDFE1B0438D300235552 /* Platform.cpp in Sources */, > 315EBE281FCF808C00AC7A89 /* PMurHash.cpp in Sources */, > 31012E5618B97B9B0039062F /* PoolAlloc.cpp in Sources */, >@@ -2587,6 +2839,7 @@ > 5C1DBE011B0438D300235552 /* Query.cpp in Sources */, > 5C1DBE031B0438D300235552 /* queryconversions.cpp in Sources */, > 5CB301311DE39F1A00D2C405 /* QueryGL.cpp in Sources */, >+ 6EDDD1FF22A17E4500AD26F9 /* QueryImpl.cpp in Sources */, > 5CCD817C1DBFE999006066B8 /* queryutils.cpp in Sources */, > 5C55D6B922826BC800B5BA2C /* RecordConstantPrecision.cpp in Sources */, > 5C55D6BA22826BC800B5BA2C /* RegenerateStructNames.cpp in Sources */, >@@ -2599,6 +2852,7 @@ > 5C1DBE071B0438D300235552 /* Renderbuffer.cpp in Sources */, > 5CB301331DE39F1A00D2C405 /* RenderbufferGL.cpp in Sources */, > 5CB304F71DE4164800D2C405 /* renderer_utils.cpp in Sources */, >+ 6EDDD21022A1800A00AD26F9 /* RendererCGL.mm in Sources */, > 5CB301371DE39F1A00D2C405 /* RendererGL.cpp in Sources */, > 5CB301351DE39F1A00D2C405 /* renderergl_utils.cpp in Sources */, > 5C55D70622826CB300B5BA2C /* ReplaceVariable.cpp in Sources */, >@@ -2620,8 +2874,10 @@ > 5C55D6CC22826BC800B5BA2C /* SeparateArrayInitialization.cpp in Sources */, > 5C55D6CD22826BC800B5BA2C /* SeparateDeclarations.cpp in Sources */, > 5C55D6CE22826BC800B5BA2C /* SeparateExpressionsReturningArrays.cpp in Sources */, >+ 6EDDD1F122A0918800AD26F9 /* sha1.cc in Sources */, > 5C1DBF291B0438D300235552 /* Shader.cpp in Sources */, > 5CB3013B1DE39F1A00D2C405 /* ShaderGL.cpp in Sources */, >+ 6EDDD20322A17E4500AD26F9 /* ShaderImpl.cpp in Sources */, > 31012E6218B97B9B0039062F /* ShaderLang.cpp in Sources */, > 5C1DBC411B04375F00235552 /* ShaderVars.cpp in Sources */, > 5C55D6CF22826BC800B5BA2C /* SimplifyLoopConditions.cpp in Sources */, >@@ -2642,6 +2898,8 @@ > 31A331C61EA5ED5F00FD2203 /* system_utils_mac.cpp in Sources */, > 5C55D7302282747700B5BA2C /* system_utils_posix.cpp in Sources */, > 5C55D7202282747700B5BA2C /* system_utils_unittest_helper.cpp in Sources */, >+ 6EDDD22122A1835000AD26F9 /* SystemInfo.cpp in Sources */, >+ 6EDDD22022A1835000AD26F9 /* SystemInfo_mac.mm in Sources */, > 5C1DBF301B0438D300235552 /* Texture.cpp in Sources */, > 315EBD991FCE443600AC7A89 /* TextureFunctionHLSL.cpp in Sources */, > 5CB301411DE39F1A00D2C405 /* TextureGL.cpp in Sources */, >@@ -2674,6 +2932,7 @@ > 315EBDA31FCE443600AC7A89 /* ValidateVaryingLocations.cpp in Sources */, > 5C1DBF371B0438D300235552 /* validationEGL.cpp in Sources */, > 5C1DBF391B0438D300235552 /* validationES.cpp in Sources */, >+ 6EDDD1E3229F626A00AD26F9 /* validationES1.cpp in Sources */, > 5C1DBF3B1B0438D300235552 /* validationES2.cpp in Sources */, > 5C1DBF3D1B0438D300235552 /* validationES3.cpp in Sources */, > 5CCD81821DBFE999006066B8 /* validationES31.cpp in Sources */, >@@ -2684,8 +2943,10 @@ > 5C1DBF3F1B0438D300235552 /* VertexArray.cpp in Sources */, > 5CB301451DE39F1A00D2C405 /* VertexArrayGL.cpp in Sources */, > 5C1DBF411B0438D300235552 /* VertexAttribute.cpp in Sources */, >+ 6EDDD21222A1800A00AD26F9 /* WindowSurfaceCGL.mm in Sources */, > 315EBDE71FCE452D00AC7A89 /* WorkerThread.cpp in Sources */, > 5C55D6D522826BC800B5BA2C /* WrapSwitchStatementsInBlocks.cpp in Sources */, >+ 6EDDD1EA229F634F00AD26F9 /* xxhash.c in Sources */, > ); > runOnlyForDeploymentPostprocessing = 0; > }; >diff --git a/Source/ThirdParty/ANGLE/adjust-angle-include-paths.sh b/Source/ThirdParty/ANGLE/adjust-angle-include-paths.sh >new file mode 100755 >index 0000000000000000000000000000000000000000..829760462026e7ee933f5cafc5a66054c36bc038 >--- /dev/null >+++ b/Source/ThirdParty/ANGLE/adjust-angle-include-paths.sh >@@ -0,0 +1,39 @@ >+#!/bin/sh >+ >+# WebKit builds ANGLE as a static library, and exports some of the >+# internal header files as "public headers" in the Xcode project for >+# consumption by other build targets - e.g. WebCore. >+# >+# The build phase which copies these headers also flattens the >+# directory structure (so that "ANGLE" is the top-level directory >+# containing all of them - e.g., "#include <ANGLE/gl2.h>"). >+# >+# It isn't practical to override the include paths so drastically for >+# the other build targets (like WebCore) that we could make the >+# original include paths, like <GLES2/gl2.h> work. Changing them so >+# their namespace is "ANGLE", which implicitly occurs during the "copy >+# headers" phase, is a reasonable solution. >+# >+# This script processes the header files after they're copied during >+# the Copy Header Files build phase, and adjusts their #includes so >+# that they refer to each other. This avoids modifying the ANGLE >+# sources, and allows WebCore to more easily call ANGLE APIs directly. >+ >+if [ -z "$BUILT_PRODUCTS_DIR" ] ; then >+ echo Requires BUILT_PRODUCTS_DIR environment variable to be set >+ exit 1 >+fi >+ >+output_dir=$BUILT_PRODUCTS_DIR/usr/local/include/ANGLE >+ >+for i in $output_dir/*.h ; do >+ sed -e ' >+s/^#include <EGL\/\(.*\)>/#include <ANGLE\/\1>/ >+s/^#include <GLES2\/\(.*\)>/#include <ANGLE\/\1>/ >+s/^#include <GLES3\/\(.*\)>/#include <ANGLE\/\1>/ >+s/^#include <KHR\/\(.*\)>/#include <ANGLE\/\1>/ >+s/^#include <export.h>/#include <ANGLE\/export.h>/ >+s/^#include "\(eglext_angle\|gl2ext_angle\|ShaderVars\).h"/#include <ANGLE\/\1.h>/ >+' $i > $i.new >+ mv $i.new $i >+done >diff --git a/Source/ThirdParty/ANGLE/changes.diff b/Source/ThirdParty/ANGLE/changes.diff >index 6a73b4d3ce1877b0056e41cc5690178dc93b2243..1dd3054e7b2bc666d6948d435730ee0f993920fe 100644 >--- a/Source/ThirdParty/ANGLE/changes.diff >+++ b/Source/ThirdParty/ANGLE/changes.diff >@@ -276,6 +276,39 @@ index e05076fcb..19be0f89d 100644 > /* Bison interface for Yacc-like parsers in C > > Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc. >+diff --git a/src/gpu_info_util/SystemInfo.cpp b/src/gpu_info_util/SystemInfo.cpp >+index 08a2c39a536..10377ae1d8f 100644 >+--- a/src/gpu_info_util/SystemInfo.cpp >++++ b/src/gpu_info_util/SystemInfo.cpp >+@@ -206,13 +206,13 @@ bool ParseMacMachineModel(const std::string &identifier, >+ const char *commaPtr = &identifier[commaLoc + 1]; >+ char *endPtr = nullptr; >+ >+- int32_t majorTmp = std::strtol(numberPtr, &endPtr, 10); >++ int32_t majorTmp = static_cast<int32_t>(std::strtol(numberPtr, &endPtr, 10)); >+ if (endPtr == numberPtr) >+ { >+ return false; >+ } >+ >+- int32_t minorTmp = std::strtol(commaPtr, &endPtr, 10); >++ int32_t minorTmp = static_cast<int32_t>(std::strtol(commaPtr, &endPtr, 10)); >+ if (endPtr == commaPtr) >+ { >+ return false; >+diff --git a/src/gpu_info_util/SystemInfo_mac.mm b/src/gpu_info_util/SystemInfo_mac.mm >+index 25aed136273..f581a609823 100644 >+--- a/src/gpu_info_util/SystemInfo_mac.mm >++++ b/src/gpu_info_util/SystemInfo_mac.mm >+@@ -156,7 +156,7 @@ bool GetSystemInfo(SystemInfo *info) >+ { >+ if (info->gpus[i].vendorId == activeVendor && info->gpus[i].deviceId == activeDevice) >+ { >+- info->activeGPUIndex = i; >++ info->activeGPUIndex = static_cast<int>(i); >+ break; >+ } >+ } > diff --git a/src/libANGLE/Image.cpp b/src/libANGLE/Image.cpp > index d94d311a9..3c077c365 100644 > --- a/src/libANGLE/Image.cpp >@@ -452,6 +485,123 @@ index e819ba8df..996aa7e1e 100644 > } > } > } >+diff --git a/src/libANGLE/renderer/gl/cgl/DisplayCGL.mm b/src/libANGLE/renderer/gl/cgl/DisplayCGL.mm >+index d2d37b6f5f0..592e2a39d7b 100644 >+--- a/src/libANGLE/renderer/gl/cgl/DisplayCGL.mm >++++ b/src/libANGLE/renderer/gl/cgl/DisplayCGL.mm >+@@ -8,6 +8,8 @@ >+ >+ #include "libANGLE/renderer/gl/cgl/DisplayCGL.h" >+ >++#define GL_SILENCE_DEPRECATION >++ >+ #import <Cocoa/Cocoa.h> >+ #include <EGL/eglext.h> >+ #include <dlfcn.h> >+diff --git a/src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.mm b/src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.mm >+index 261c1db7568..58582ee79c8 100644 >+--- a/src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.mm >++++ b/src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.mm >+@@ -49,12 +49,13 @@ static const IOSurfaceFormatInfo kIOSurfaceFormats[] = { >+ }; >+ // clang-format on >+ >+-int FindIOSurfaceFormatIndex(GLenum internalFormat, GLenum type) >++int FindIOSurfaceFormatIndex(EGLAttrib internalFormat, EGLAttrib type) >+ { >+ for (int i = 0; i < static_cast<int>(ArraySize(kIOSurfaceFormats)); ++i) >+ { >+ const auto &formatInfo = kIOSurfaceFormats[i]; >+- if (formatInfo.internalFormat == internalFormat && formatInfo.type == type) >++ if (formatInfo.internalFormat == static_cast<GLenum>(internalFormat) && >++ formatInfo.type == static_cast<GLenum>(type)) >+ { >+ return i; >+ } >+@@ -82,12 +83,12 @@ IOSurfaceSurfaceCGL::IOSurfaceSurfaceCGL(const egl::SurfaceState &state, >+ CFRetain(mIOSurface); >+ >+ // Extract attribs useful for the call to CGLTexImageIOSurface2D >+- mWidth = attribs.get(EGL_WIDTH); >+- mHeight = attribs.get(EGL_HEIGHT); >+- mPlane = attribs.get(EGL_IOSURFACE_PLANE_ANGLE); >++ mWidth = static_cast<int>(attribs.get(EGL_WIDTH)); >++ mHeight = static_cast<int>(attribs.get(EGL_HEIGHT)); >++ mPlane = static_cast<int>(attribs.get(EGL_IOSURFACE_PLANE_ANGLE)); >+ >+- EGLAttrib internalFormat = attribs.get(EGL_TEXTURE_INTERNAL_FORMAT_ANGLE); >+- EGLAttrib type = attribs.get(EGL_TEXTURE_TYPE_ANGLE); >++ EGLAttrib internalFormat = static_cast<int>(attribs.get(EGL_TEXTURE_INTERNAL_FORMAT_ANGLE)); >++ EGLAttrib type = static_cast<int>(attribs.get(EGL_TEXTURE_TYPE_ANGLE)); >+ mFormatIndex = FindIOSurfaceFormatIndex(internalFormat, type); >+ ASSERT(mFormatIndex >= 0); >+ } >+diff --git a/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.h b/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.h >+index abaa1149061..93418176873 100644 >+--- a/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.h >++++ b/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.h >+@@ -17,7 +17,7 @@ typedef _CGLContextObject *CGLContextObj; >+ struct __IOSurface; >+ typedef __IOSurface *IOSurfaceRef; >+ >+-@class SwapLayer; >++@class WebSwapLayer; >+ >+ namespace rx >+ { >+@@ -87,7 +87,7 @@ class WindowSurfaceCGL : public SurfaceGL >+ const gl::FramebufferState &state) override; >+ >+ private: >+- SwapLayer *mSwapLayer; >++ WebSwapLayer *mSwapLayer; >+ SharedSwapState mSwapState; >+ uint64_t mCurrentSwapId; >+ >+diff --git a/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm b/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm >+index ac5e3998096..ab77bc29cdf 100644 >+--- a/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm >++++ b/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm >+@@ -8,6 +8,8 @@ >+ >+ #include "libANGLE/renderer/gl/cgl/WindowSurfaceCGL.h" >+ >++#define GL_SILENCE_DEPRECATION >++ >+ #import <Cocoa/Cocoa.h> >+ #include <OpenGL/OpenGL.h> >+ #import <QuartzCore/QuartzCore.h> >+@@ -19,7 +21,7 @@ >+ #include "libANGLE/renderer/gl/StateManagerGL.h" >+ #include "libANGLE/renderer/gl/cgl/DisplayCGL.h" >+ >+-@interface SwapLayer : CAOpenGLLayer >++@interface WebSwapLayer : CAOpenGLLayer >+ { >+ CGLContextObj mDisplayContext; >+ >+@@ -34,7 +36,7 @@ >+ withFunctions:(const rx::FunctionsGL *)functions; >+ @end >+ >+-@implementation SwapLayer >++@implementation WebSwapLayer >+ - (id)initWithSharedState:(rx::SharedSwapState *)swapState >+ withContext:(CGLContextObj)displayContext >+ withFunctions:(const rx::FunctionsGL *)functions >+@@ -205,9 +207,9 @@ egl::Error WindowSurfaceCGL::initialize(const egl::Display *display) >+ mSwapState.lastRendered = &mSwapState.textures[1]; >+ mSwapState.beingPresented = &mSwapState.textures[2]; >+ >+- mSwapLayer = [[SwapLayer alloc] initWithSharedState:&mSwapState >+- withContext:mContext >+- withFunctions:mFunctions]; >++ mSwapLayer = [[WebSwapLayer alloc] initWithSharedState:&mSwapState >++ withContext:mContext >++ withFunctions:mFunctions]; >+ [mLayer addSublayer:mSwapLayer]; >+ >+ mFunctions->genRenderbuffers(1, &mDSRenderbuffer); > diff --git a/src/libANGLE/validationES3.cpp b/src/libANGLE/validationES3.cpp > index 1acb57843..94db8b545 100644 > --- a/src/libANGLE/validationES3.cpp >diff --git a/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo.cpp b/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo.cpp >index 08a2c39a536f5aaab0835bf5439324acff5c78a2..10377ae1d8fd5d5e22844bc5efcfcd003b2c3ee4 100644 >--- a/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo.cpp >+++ b/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo.cpp >@@ -206,13 +206,13 @@ bool ParseMacMachineModel(const std::string &identifier, > const char *commaPtr = &identifier[commaLoc + 1]; > char *endPtr = nullptr; > >- int32_t majorTmp = std::strtol(numberPtr, &endPtr, 10); >+ int32_t majorTmp = static_cast<int32_t>(std::strtol(numberPtr, &endPtr, 10)); > if (endPtr == numberPtr) > { > return false; > } > >- int32_t minorTmp = std::strtol(commaPtr, &endPtr, 10); >+ int32_t minorTmp = static_cast<int32_t>(std::strtol(commaPtr, &endPtr, 10)); > if (endPtr == commaPtr) > { > return false; >diff --git a/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_mac.mm b/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_mac.mm >index 25aed1362734742df840e64855c04d35e117cfce..f581a609823b1378dce5ca51f8dec7a8a9826968 100644 >--- a/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_mac.mm >+++ b/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_mac.mm >@@ -156,7 +156,7 @@ bool GetSystemInfo(SystemInfo *info) > { > if (info->gpus[i].vendorId == activeVendor && info->gpus[i].deviceId == activeDevice) > { >- info->activeGPUIndex = i; >+ info->activeGPUIndex = static_cast<int>(i); > break; > } > } >diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/DisplayCGL.mm b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/DisplayCGL.mm >index d2d37b6f5f0e2a513cd948bc8edeea4b13d7359b..592e2a39d7b3cfbdbf4180e5ee868b3d039f48b2 100644 >--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/DisplayCGL.mm >+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/DisplayCGL.mm >@@ -8,6 +8,8 @@ > > #include "libANGLE/renderer/gl/cgl/DisplayCGL.h" > >+#define GL_SILENCE_DEPRECATION >+ > #import <Cocoa/Cocoa.h> > #include <EGL/eglext.h> > #include <dlfcn.h> >diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.mm b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.mm >index 261c1db75682fc9b40880adde56fbdface1619f5..58582ee79c851d04ea5ff3f7b73a12b5df7e4894 100644 >--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.mm >+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.mm >@@ -49,12 +49,13 @@ static const IOSurfaceFormatInfo kIOSurfaceFormats[] = { > }; > // clang-format on > >-int FindIOSurfaceFormatIndex(GLenum internalFormat, GLenum type) >+int FindIOSurfaceFormatIndex(EGLAttrib internalFormat, EGLAttrib type) > { > for (int i = 0; i < static_cast<int>(ArraySize(kIOSurfaceFormats)); ++i) > { > const auto &formatInfo = kIOSurfaceFormats[i]; >- if (formatInfo.internalFormat == internalFormat && formatInfo.type == type) >+ if (formatInfo.internalFormat == static_cast<GLenum>(internalFormat) && >+ formatInfo.type == static_cast<GLenum>(type)) > { > return i; > } >@@ -82,12 +83,12 @@ IOSurfaceSurfaceCGL::IOSurfaceSurfaceCGL(const egl::SurfaceState &state, > CFRetain(mIOSurface); > > // Extract attribs useful for the call to CGLTexImageIOSurface2D >- mWidth = attribs.get(EGL_WIDTH); >- mHeight = attribs.get(EGL_HEIGHT); >- mPlane = attribs.get(EGL_IOSURFACE_PLANE_ANGLE); >+ mWidth = static_cast<int>(attribs.get(EGL_WIDTH)); >+ mHeight = static_cast<int>(attribs.get(EGL_HEIGHT)); >+ mPlane = static_cast<int>(attribs.get(EGL_IOSURFACE_PLANE_ANGLE)); > >- EGLAttrib internalFormat = attribs.get(EGL_TEXTURE_INTERNAL_FORMAT_ANGLE); >- EGLAttrib type = attribs.get(EGL_TEXTURE_TYPE_ANGLE); >+ EGLAttrib internalFormat = static_cast<int>(attribs.get(EGL_TEXTURE_INTERNAL_FORMAT_ANGLE)); >+ EGLAttrib type = static_cast<int>(attribs.get(EGL_TEXTURE_TYPE_ANGLE)); > mFormatIndex = FindIOSurfaceFormatIndex(internalFormat, type); > ASSERT(mFormatIndex >= 0); > } >diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.h >index abaa1149061190bc4717c9591853c8e2fc66e0ed..93418176873c27393c8c5587bb6e657ce8fca723 100644 >--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.h >+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.h >@@ -17,7 +17,7 @@ typedef _CGLContextObject *CGLContextObj; > struct __IOSurface; > typedef __IOSurface *IOSurfaceRef; > >-@class SwapLayer; >+@class WebSwapLayer; > > namespace rx > { >@@ -87,7 +87,7 @@ class WindowSurfaceCGL : public SurfaceGL > const gl::FramebufferState &state) override; > > private: >- SwapLayer *mSwapLayer; >+ WebSwapLayer *mSwapLayer; > SharedSwapState mSwapState; > uint64_t mCurrentSwapId; > >diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm >index ac5e39980961033bb05b0d1da0ee8017ee035dd7..ab77bc29cdf62aa2a50574e08be59dc08caa12ab 100644 >--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm >+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm >@@ -8,6 +8,8 @@ > > #include "libANGLE/renderer/gl/cgl/WindowSurfaceCGL.h" > >+#define GL_SILENCE_DEPRECATION >+ > #import <Cocoa/Cocoa.h> > #include <OpenGL/OpenGL.h> > #import <QuartzCore/QuartzCore.h> >@@ -19,7 +21,7 @@ > #include "libANGLE/renderer/gl/StateManagerGL.h" > #include "libANGLE/renderer/gl/cgl/DisplayCGL.h" > >-@interface SwapLayer : CAOpenGLLayer >+@interface WebSwapLayer : CAOpenGLLayer > { > CGLContextObj mDisplayContext; > >@@ -34,7 +36,7 @@ > withFunctions:(const rx::FunctionsGL *)functions; > @end > >-@implementation SwapLayer >+@implementation WebSwapLayer > - (id)initWithSharedState:(rx::SharedSwapState *)swapState > withContext:(CGLContextObj)displayContext > withFunctions:(const rx::FunctionsGL *)functions >@@ -205,9 +207,9 @@ egl::Error WindowSurfaceCGL::initialize(const egl::Display *display) > mSwapState.lastRendered = &mSwapState.textures[1]; > mSwapState.beingPresented = &mSwapState.textures[2]; > >- mSwapLayer = [[SwapLayer alloc] initWithSharedState:&mSwapState >- withContext:mContext >- withFunctions:mFunctions]; >+ mSwapLayer = [[WebSwapLayer alloc] initWithSharedState:&mSwapState >+ withContext:mContext >+ withFunctions:mFunctions]; > [mLayer addSublayer:mSwapLayer]; > > mFunctions->genRenderbuffers(1, &mDSRenderbuffer);
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=371212">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 197755
:
369534
|
369780
|
369786
|
369787
|
369793
|
371212
|
371576
|
371764
|
371784
|
371798
|
372093
|
372129
|
372309
|
372349