diff --git a/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj b/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj index 8d5387b0c464..dffb28a54320 100644 --- a/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj +++ b/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj @@ -22,13 +22,6 @@ /* Begin PBXBuildFile section */ 3154A847266C4AFF00BF33B7 /* ImageMtl.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3154A845266C4AFE00BF33B7 /* ImageMtl.mm */; }; - 31CD0000249184B500486F27 /* WindowSurfaceCGL.h in Headers */ = {isa = PBXBuildFile; fileRef = A31B6181230B747E001610D7 /* WindowSurfaceCGL.h */; }; - 31CD0001249184B500486F27 /* DeviceCGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E31A0A2234EEED400C84784 /* DeviceCGL.h */; }; - 31CD0002249184B500486F27 /* IOSurfaceSurfaceCGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CCD59712284FA820018F2D8 /* IOSurfaceSurfaceCGL.h */; }; - 31CD0003249184B500486F27 /* RendererCGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CCD59762284FA830018F2D8 /* RendererCGL.h */; }; - 31CD0004249184B500486F27 /* DisplayCGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB301491DE39F4700D2C405 /* DisplayCGL.h */; }; - 31CD0005249184B500486F27 /* PbufferSurfaceCGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB3014B1DE39F4700D2C405 /* PbufferSurfaceCGL.h */; }; - 31CD0006249184B500486F27 /* ContextCGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CCD59752284FA820018F2D8 /* ContextCGL.h */; }; 31CD0007249184BB00486F27 /* ContextEAGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 313BCE512361133900FC39E5 /* ContextEAGL.h */; }; 31CD0008249184BB00486F27 /* DisplayEAGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 313BCE462361133800FC39E5 /* DisplayEAGL.h */; }; 31CD0009249184BB00486F27 /* DeviceEAGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 313BCE4D2361133900FC39E5 /* DeviceEAGL.h */; }; @@ -410,7 +403,15 @@ 7BCF49C528AD1C8C0090D34A /* apple_platform_utils.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7BCF49C228AD1C8C0090D34A /* apple_platform_utils.mm */; }; 7BCF49C628AD1C8C0090D34A /* CircularBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BCF49C328AD1C8C0090D34A /* CircularBuffer.h */; }; 7BCF49C728AD1C8C0090D34A /* apple_platform_utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BCF49C428AD1C8C0090D34A /* apple_platform_utils.h */; }; + 7BDC2D8129E9951900DF385C /* SourcesEAGL2-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7BDC2D8029E9951900DF385C /* SourcesEAGL2-mm.mm */; }; 7BDC8C7D2993A4E000C2BDDF /* mtl_library_cache.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7BDC8C7A2993A4CB00C2BDDF /* mtl_library_cache.mm */; }; + 7BFF6EDD29E9908A009E1A57 /* SourcesEAGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B037F8F29E98CF100D23E74 /* SourcesEAGL.cpp */; }; + 7BFF6EDE29E9908A009E1A57 /* SourcesCGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B037F9329E98CF100D23E74 /* SourcesCGL.cpp */; }; + 7BFF6EDF29E9908A009E1A57 /* SourcesPlatform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B037F9429E98CF200D23E74 /* SourcesPlatform.cpp */; }; + 7BFF6EE029E9908A009E1A57 /* SourcesEAGL1-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7B037F9029E98CF100D23E74 /* SourcesEAGL1-mm.mm */; }; + 7BFF6EE129E9908A009E1A57 /* SourcesCGL-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7B037F9129E98CF100D23E74 /* SourcesCGL-mm.mm */; }; + 7BFF6EE229E9908A009E1A57 /* SourcesPlatform-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7B037F9529E98CF200D23E74 /* SourcesPlatform-mm.mm */; }; + 7BFF6EE329E9908A009E1A57 /* SourcesGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B037F9229E98CF100D23E74 /* SourcesGL.cpp */; }; A3C49BF6255DF6C4005E8DF7 /* compression_utils_portable.h in Headers */ = {isa = PBXBuildFile; fileRef = A3C49BF1255DEDC5005E8DF7 /* compression_utils_portable.h */; }; A3C49BFB255DF6E6005E8DF7 /* EGLReusableSync.h in Headers */ = {isa = PBXBuildFile; fileRef = A3C3FE13255DDE0100B73018 /* EGLReusableSync.h */; }; A3C49BFC255DF6E6005E8DF7 /* EGLSyncImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = A3C3FE14255DDE0200B73018 /* EGLSyncImpl.h */; }; @@ -441,7 +442,6 @@ DF83E2222639FC74000825EF /* PackedEnums.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C55D71C2282747700B5BA2C /* PackedEnums.cpp */; }; DF83E2232639FC74000825EF /* entry_points_enum_autogen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A3C3FE06255DDD1C00B73018 /* entry_points_enum_autogen.cpp */; }; DF83E2242639FC74000825EF /* angleutils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C1DBBE71B0436EC00235552 /* angleutils.cpp */; }; - DF83E2252639FC80000825EF /* FunctionsCGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A3C3FE20255DDE7900B73018 /* FunctionsCGL.cpp */; }; DF83E2292639FCB0000825EF /* DirectiveHandlerBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A264F89516974DED006FAA5A /* DirectiveHandlerBase.cpp */; }; DF83E22A2639FCB0000825EF /* Lexer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A264F89D16974DED006FAA5A /* Lexer.cpp */; }; DF83E22B2639FCB0000825EF /* MacroExpander.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A264F8A116974DED006FAA5A /* MacroExpander.cpp */; }; @@ -568,9 +568,7 @@ DF83E2D62639FD84000825EF /* CollectVariables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 315EBD551FCE442C00AC7A89 /* CollectVariables.cpp */; }; DF83E2D72639FD84000825EF /* FunctionLookup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C55D6DA22826C7800B5BA2C /* FunctionLookup.cpp */; }; DF83E2D82639FD90000825EF /* SystemInfo_apple.mm in Sources */ = {isa = PBXBuildFile; fileRef = 31647F9E2511A1A60010F8FB /* SystemInfo_apple.mm */; }; - DF83E2D92639FD90000825EF /* SystemInfo_macos.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CCD59972284FC750018F2D8 /* SystemInfo_macos.mm */; }; DF83E2DA2639FD90000825EF /* SystemInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CCD59982284FC750018F2D8 /* SystemInfo.cpp */; }; - DF83E2DB2639FD90000825EF /* SystemInfo_ios.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31B1571F236B7FAE00CAA4FD /* SystemInfo_ios.cpp */; }; DF83E2DD2639FE17000825EF /* copyimage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CCD59872284FC400018F2D8 /* copyimage.cpp */; }; DF83E2DE2639FE17000825EF /* Observer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CCD595B2284F7960018F2D8 /* Observer.cpp */; }; DF83E2DF2639FE17000825EF /* imageformats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CCD59892284FC400018F2D8 /* imageformats.cpp */; }; @@ -651,28 +649,16 @@ DF83E3422639FE2A000825EF /* entry_points_gles_3_0_autogen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A30B5817238DF4BA0079FDDC /* entry_points_gles_3_0_autogen.cpp */; }; DF83E3442639FE92000825EF /* FramebufferGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB300F31DE39F1A00D2C405 /* FramebufferGL.cpp */; }; DF83E3452639FE92000825EF /* MemoryObjectGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A30307852305F8EF002DA972 /* MemoryObjectGL.cpp */; }; - DF83E3462639FE92000825EF /* DisplayCGL.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CB3014A1DE39F4700D2C405 /* DisplayCGL.mm */; }; DF83E3472639FE92000825EF /* SurfaceGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB3010C1DE39F1A00D2C405 /* SurfaceGL.cpp */; }; - DF83E3482639FE92000825EF /* ContextEAGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 313BCE4A2361133900FC39E5 /* ContextEAGL.cpp */; }; - DF83E3492639FE92000825EF /* RendererCGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CCD59742284FA820018F2D8 /* RendererCGL.cpp */; }; DF83E34A2639FE92000825EF /* FenceNVGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB300ED1DE39F1A00D2C405 /* FenceNVGL.cpp */; }; DF83E34B2639FE92000825EF /* ImageGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A30307882305F8F0002DA972 /* ImageGL.cpp */; }; - DF83E34C2639FE92000825EF /* PbufferSurfaceEAGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 313BCE482361133800FC39E5 /* PbufferSurfaceEAGL.cpp */; }; DF83E34D2639FE92000825EF /* SemaphoreGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A30307842305F8EF002DA972 /* SemaphoreGL.cpp */; }; DF83E34E2639FE92000825EF /* ProgramGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB300FC1DE39F1A00D2C405 /* ProgramGL.cpp */; }; - DF83E34F2639FE92000825EF /* FunctionsEAGL.mm in Sources */ = {isa = PBXBuildFile; fileRef = A3C49BEC255DEA52005E8DF7 /* FunctionsEAGL.mm */; }; DF83E3502639FE92000825EF /* BufferGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB300E21DE39F1A00D2C405 /* BufferGL.cpp */; }; - DF83E3512639FE92000825EF /* WindowSurfaceEAGL.mm in Sources */ = {isa = PBXBuildFile; fileRef = 313BCE522361133900FC39E5 /* WindowSurfaceEAGL.mm */; }; - DF83E3522639FE92000825EF /* RendererEAGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 313BCE4B2361133900FC39E5 /* RendererEAGL.cpp */; }; DF83E3532639FE92000825EF /* DispatchTableGL_autogen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 315EBDB41FCE44BE00AC7A89 /* DispatchTableGL_autogen.cpp */; }; - DF83E3542639FE92000825EF /* IOSurfaceSurfaceEAGL.mm in Sources */ = {isa = PBXBuildFile; fileRef = 313BCE4E2361133900FC39E5 /* IOSurfaceSurfaceEAGL.mm */; }; - DF83E3552639FE92000825EF /* DeviceCGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6E31A0A1234EEED400C84784 /* DeviceCGL.cpp */; }; - DF83E3562639FE92000825EF /* DeviceEAGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 313BCE4C2361133900FC39E5 /* DeviceEAGL.cpp */; }; DF83E3572639FE92000825EF /* FunctionsGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB300F71DE39F1A00D2C405 /* FunctionsGL.cpp */; }; DF83E3582639FE92000825EF /* ContextGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB300E71DE39F1A00D2C405 /* ContextGL.cpp */; }; DF83E3592639FE92000825EF /* BlitGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB300E01DE39F1A00D2C405 /* BlitGL.cpp */; }; - DF83E35A2639FE92000825EF /* IOSurfaceSurfaceCGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CCD59732284FA820018F2D8 /* IOSurfaceSurfaceCGL.cpp */; }; - DF83E35B2639FE92000825EF /* PbufferSurfaceCGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB3014C1DE39F4700D2C405 /* PbufferSurfaceCGL.cpp */; }; DF83E35C2639FE92000825EF /* ClearMultiviewGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 315EBDB31FCE44BE00AC7A89 /* ClearMultiviewGL.cpp */; }; DF83E35D2639FE92000825EF /* DisplayGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB300E91DE39F1A00D2C405 /* DisplayGL.cpp */; }; DF83E35E2639FE92000825EF /* TextureGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB3010E1DE39F1A00D2C405 /* TextureGL.cpp */; }; @@ -680,13 +666,10 @@ DF83E3602639FE92000825EF /* ProgramPipelineGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 315EBDB01FCE44BD00AC7A89 /* ProgramPipelineGL.cpp */; }; DF83E3612639FE92000825EF /* TransformFeedbackGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB301101DE39F1A00D2C405 /* TransformFeedbackGL.cpp */; }; DF83E3622639FE92000825EF /* StateManagerGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB3010A1DE39F1A00D2C405 /* StateManagerGL.cpp */; }; - DF83E3632639FE92000825EF /* ContextCGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CCD59722284FA820018F2D8 /* ContextCGL.cpp */; }; DF83E3642639FE92000825EF /* DisplayApple_api.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A3C3FE19255DDE4300B73018 /* DisplayApple_api.cpp */; }; - DF83E3652639FE92000825EF /* DisplayEAGL.mm in Sources */ = {isa = PBXBuildFile; fileRef = 313BCE532361133900FC39E5 /* DisplayEAGL.mm */; }; DF83E3662639FE92000825EF /* formatutilsgl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB300F11DE39F1A00D2C405 /* formatutilsgl.cpp */; }; DF83E3672639FE92000825EF /* RendererGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB301041DE39F1A00D2C405 /* RendererGL.cpp */; }; DF83E3682639FE92000825EF /* ShaderGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB301081DE39F1A00D2C405 /* ShaderGL.cpp */; }; - DF83E3692639FE92000825EF /* WindowSurfaceCGL.mm in Sources */ = {isa = PBXBuildFile; fileRef = A31B6182230B747F001610D7 /* WindowSurfaceCGL.mm */; }; DF83E36A2639FE92000825EF /* SamplerGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB301061DE39F1A00D2C405 /* SamplerGL.cpp */; }; DF83E36B2639FE92000825EF /* QueryGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB300FE1DE39F1A00D2C405 /* QueryGL.cpp */; }; DF83E36C2639FE92000825EF /* CompilerGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB300E51DE39F1A00D2C405 /* CompilerGL.cpp */; }; @@ -793,22 +776,16 @@ FF62F6A027448D6A00AD6EDC /* Context_gles_3_2_autogen.h in Headers */ = {isa = PBXBuildFile; fileRef = FF62F69427448D6900AD6EDC /* Context_gles_3_2_autogen.h */; }; FF62F6A127448D6A00AD6EDC /* gles_extensions_autogen.h in Headers */ = {isa = PBXBuildFile; fileRef = FF62F69527448D6900AD6EDC /* gles_extensions_autogen.h */; }; FFD0022727449647002BE3BC /* DeviceMtl.mm in Sources */ = {isa = PBXBuildFile; fileRef = FFD0022627449647002BE3BC /* DeviceMtl.mm */; }; - FFD00233274497C4002BE3BC /* RewriteUnaryMinusOperatorFloat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FFD00229274497C4002BE3BC /* RewriteUnaryMinusOperatorFloat.cpp */; }; FFD00234274497C4002BE3BC /* UnfoldShortCircuitAST.h in Headers */ = {isa = PBXBuildFile; fileRef = FFD0022A274497C4002BE3BC /* UnfoldShortCircuitAST.h */; }; FFD00235274497C4002BE3BC /* RewriteDoWhile.h in Headers */ = {isa = PBXBuildFile; fileRef = FFD0022B274497C4002BE3BC /* RewriteDoWhile.h */; }; - FFD00236274497C4002BE3BC /* RewriteDoWhile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FFD0022C274497C4002BE3BC /* RewriteDoWhile.cpp */; }; FFD00237274497C4002BE3BC /* AddAndTrueToLoopCondition.h in Headers */ = {isa = PBXBuildFile; fileRef = FFD0022D274497C4002BE3BC /* AddAndTrueToLoopCondition.h */; }; - FFD00238274497C4002BE3BC /* RewriteRowMajorMatrices.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FFD0022E274497C4002BE3BC /* RewriteRowMajorMatrices.cpp */; }; FFD00239274497C4002BE3BC /* RewriteUnaryMinusOperatorFloat.h in Headers */ = {isa = PBXBuildFile; fileRef = FFD0022F274497C4002BE3BC /* RewriteUnaryMinusOperatorFloat.h */; }; FFD0023A274497C4002BE3BC /* RewriteRowMajorMatrices.h in Headers */ = {isa = PBXBuildFile; fileRef = FFD00230274497C4002BE3BC /* RewriteRowMajorMatrices.h */; }; - FFD0023B274497C4002BE3BC /* AddAndTrueToLoopCondition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FFD00231274497C4002BE3BC /* AddAndTrueToLoopCondition.cpp */; }; - FFD0023C274497C4002BE3BC /* UnfoldShortCircuitAST.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FFD00232274497C4002BE3BC /* UnfoldShortCircuitAST.cpp */; }; FFD00246274497CD002BE3BC /* UseInterfaceBlockFields.h in Headers */ = {isa = PBXBuildFile; fileRef = FFD0023E274497CD002BE3BC /* UseInterfaceBlockFields.h */; }; FFD00247274497CD002BE3BC /* ClampFragDepth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FFD0023F274497CD002BE3BC /* ClampFragDepth.cpp */; }; FFD00248274497CD002BE3BC /* UseInterfaceBlockFields.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FFD00240274497CD002BE3BC /* UseInterfaceBlockFields.cpp */; }; FFD00249274497CD002BE3BC /* RegenerateStructNames.h in Headers */ = {isa = PBXBuildFile; fileRef = FFD00241274497CD002BE3BC /* RegenerateStructNames.h */; }; FFD0024A274497CD002BE3BC /* ClampFragDepth.h in Headers */ = {isa = PBXBuildFile; fileRef = FFD00242274497CD002BE3BC /* ClampFragDepth.h */; }; - FFD0024B274497CD002BE3BC /* RegenerateStructNames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FFD00243274497CD002BE3BC /* RegenerateStructNames.cpp */; }; FFD0024C274497CD002BE3BC /* RewriteRepeatedAssignToSwizzled.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FFD00244274497CD002BE3BC /* RewriteRepeatedAssignToSwizzled.cpp */; }; FFD0024D274497CD002BE3BC /* RewriteRepeatedAssignToSwizzled.h in Headers */ = {isa = PBXBuildFile; fileRef = FFD00245274497CD002BE3BC /* RewriteRepeatedAssignToSwizzled.h */; }; FFD0029327449D1D002BE3BC /* FrameCapture_mock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FFD0029227449D1D002BE3BC /* FrameCapture_mock.cpp */; }; @@ -1460,6 +1437,13 @@ 6ED7BDF52432CD6200E01503 /* ProgramExecutable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProgramExecutable.h; sourceTree = ""; }; 6EE2FD2C22BAE99C001D369E /* eglext_angle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = eglext_angle.h; path = include/EGL/eglext_angle.h; sourceTree = ""; }; 6EE2FD2E22BAE9CD001D369E /* gl2ext_angle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gl2ext_angle.h; path = include/GLES2/gl2ext_angle.h; sourceTree = ""; }; + 7B037F8F29E98CF100D23E74 /* SourcesEAGL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SourcesEAGL.cpp; path = WebKit/SourcesEAGL.cpp; sourceTree = ""; }; + 7B037F9029E98CF100D23E74 /* SourcesEAGL1-mm.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "SourcesEAGL1-mm.mm"; path = "WebKit/SourcesEAGL1-mm.mm"; sourceTree = ""; }; + 7B037F9129E98CF100D23E74 /* SourcesCGL-mm.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "SourcesCGL-mm.mm"; path = "WebKit/SourcesCGL-mm.mm"; sourceTree = ""; }; + 7B037F9229E98CF100D23E74 /* SourcesGL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SourcesGL.cpp; path = WebKit/SourcesGL.cpp; sourceTree = ""; }; + 7B037F9329E98CF100D23E74 /* SourcesCGL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SourcesCGL.cpp; path = WebKit/SourcesCGL.cpp; sourceTree = ""; }; + 7B037F9429E98CF200D23E74 /* SourcesPlatform.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SourcesPlatform.cpp; path = WebKit/SourcesPlatform.cpp; sourceTree = ""; }; + 7B037F9529E98CF200D23E74 /* SourcesPlatform-mm.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "SourcesPlatform-mm.mm"; path = "WebKit/SourcesPlatform-mm.mm"; sourceTree = ""; }; 7B24C80928D9A20D00E2DDB1 /* ImmutableString_ESSL_autogen.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ImmutableString_ESSL_autogen.cpp; sourceTree = ""; }; 7B24C80B28D9A25000E2DDB1 /* SymbolTable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SymbolTable.cpp; sourceTree = ""; }; 7B24C80C28D9A25000E2DDB1 /* SymbolTable_ESSL_autogen.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SymbolTable_ESSL_autogen.cpp; sourceTree = ""; }; @@ -1476,6 +1460,7 @@ 7BCF49C228AD1C8C0090D34A /* apple_platform_utils.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = apple_platform_utils.mm; sourceTree = ""; }; 7BCF49C328AD1C8C0090D34A /* CircularBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CircularBuffer.h; sourceTree = ""; }; 7BCF49C428AD1C8C0090D34A /* apple_platform_utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = apple_platform_utils.h; sourceTree = ""; }; + 7BDC2D8029E9951900DF385C /* SourcesEAGL2-mm.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "SourcesEAGL2-mm.mm"; path = "WebKit/SourcesEAGL2-mm.mm"; sourceTree = ""; }; 7BDC8C792993A4B000C2BDDF /* FixedQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FixedQueue.h; sourceTree = ""; }; 7BDC8C7A2993A4CB00C2BDDF /* mtl_library_cache.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = mtl_library_cache.mm; sourceTree = ""; }; 7BDC8C7B2993A4CB00C2BDDF /* mtl_library_cache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mtl_library_cache.h; sourceTree = ""; }; @@ -2831,6 +2816,21 @@ name = GLES; sourceTree = ""; }; + 7B037F8E29E98CDC00D23E74 /* WebKit */ = { + isa = PBXGroup; + children = ( + 7B037F9129E98CF100D23E74 /* SourcesCGL-mm.mm */, + 7B037F9329E98CF100D23E74 /* SourcesCGL.cpp */, + 7B037F8F29E98CF100D23E74 /* SourcesEAGL.cpp */, + 7B037F9029E98CF100D23E74 /* SourcesEAGL1-mm.mm */, + 7BDC2D8029E9951900DF385C /* SourcesEAGL2-mm.mm */, + 7B037F9229E98CF100D23E74 /* SourcesGL.cpp */, + 7B037F9529E98CF200D23E74 /* SourcesPlatform-mm.mm */, + 7B037F9429E98CF200D23E74 /* SourcesPlatform.cpp */, + ); + name = WebKit; + sourceTree = ""; + }; A08C3CD816D6CB35003F0B83 /* third_party */ = { isa = PBXGroup; children = ( @@ -2926,6 +2926,7 @@ FB39D06E1200ED9200088E69 = { isa = PBXGroup; children = ( + 7B037F8E29E98CDC00D23E74 /* WebKit */, 5D7C59C41208C68B001C873E /* Configurations */, 5CB3048A1DE4143400D2C405 /* Frameworks */, A29B15E916978B7D00111D97 /* include */, @@ -3275,7 +3276,6 @@ FF62F69F27448D6A00AD6EDC /* Context_gles_3_1_autogen.h in Headers */, FF62F6A027448D6A00AD6EDC /* Context_gles_3_2_autogen.h in Headers */, FF62F69827448D6A00AD6EDC /* Context_gles_ext_autogen.h in Headers */, - 31CD0006249184B500486F27 /* ContextCGL.h in Headers */, 31CD0007249184BB00486F27 /* ContextEAGL.h in Headers */, 31CD001A249184E700486F27 /* ContextGL.h in Headers */, 31CD0036249184F400486F27 /* ContextImpl.h in Headers */, @@ -3288,7 +3288,6 @@ 3A0EBFBE2980BA41002C72BC /* DeclarePerVertexBlocks.h in Headers */, 31CDFFA52491849800486F27 /* DeferGlobalInitializers.h in Headers */, 31CD005A249184FC00486F27 /* Device.h in Headers */, - 31CD0001249184B500486F27 /* DeviceCGL.h in Headers */, 31CD0009249184BB00486F27 /* DeviceEAGL.h in Headers */, 31CD0045249184F400486F27 /* DeviceImpl.h in Headers */, 3A0EBFB72980B6C1002C72BC /* DeviceMtl.h in Headers */, @@ -3300,7 +3299,6 @@ 31CD0014249184E700486F27 /* DispatchTableGL_autogen.h in Headers */, 31CD006A249184FC00486F27 /* Display.h in Headers */, A3C49C1F255DF88F005E8DF7 /* DisplayApple_api.h in Headers */, - 31CD0004249184B500486F27 /* DisplayCGL.h in Headers */, 31CD0008249184BB00486F27 /* DisplayEAGL.h in Headers */, 31CD0023249184E700486F27 /* DisplayGL.h in Headers */, 31CD002F249184F400486F27 /* DisplayImpl.h in Headers */, @@ -3408,7 +3406,6 @@ 31CDFFB3249184A100486F27 /* IntermNode_util.h in Headers */, 31CDFFB4249184A100486F27 /* IntermNodePatternMatcher.h in Headers */, 31CDFFB0249184A100486F27 /* IntermTraverse.h in Headers */, - 31CD0002249184B500486F27 /* IOSurfaceSurfaceCGL.h in Headers */, 31CD000B249184BB00486F27 /* IOSurfaceSurfaceEAGL.h in Headers */, 31CDFFEC249184A700486F27 /* IsASTDepthBelowLimit.h in Headers */, 31CDFE0F249183E100486F27 /* khrplatform.h in Headers */, @@ -3452,7 +3449,6 @@ 31CDFF662491848C00486F27 /* PackedEnums.h in Headers */, 31CDFF692491848C00486F27 /* PackedGLEnums_autogen.h in Headers */, 31CDFFDF249184A700486F27 /* ParseContext.h in Headers */, - 31CD0005249184B500486F27 /* PbufferSurfaceCGL.h in Headers */, 31CD000C249184BB00486F27 /* PbufferSurfaceEAGL.h in Headers */, 3A7AA54D28E1319D009E09C2 /* PixelLocalStorage.h in Headers */, 31CDFF582491848C00486F27 /* platform.h in Headers */, @@ -3495,7 +3491,6 @@ 31CD0035249184F400486F27 /* RenderbufferImpl.h in Headers */, 31CD0039249184F400486F27 /* RenderbufferImpl_mock.h in Headers */, 31CD002E249184F400486F27 /* renderer_utils.h in Headers */, - 31CD0003249184B500486F27 /* RendererCGL.h in Headers */, 31CD000A249184BB00486F27 /* RendererEAGL.h in Headers */, 31CD001B249184E700486F27 /* RendererGL.h in Headers */, 31CD001E249184E700486F27 /* renderergl_utils.h in Headers */, @@ -3627,7 +3622,6 @@ 31CD004D249184F400486F27 /* VertexArrayImpl.h in Headers */, 31CD007D249184FD00486F27 /* VertexAttribute.h in Headers */, 31CDFFB1249184A100486F27 /* Visit.h in Headers */, - 31CD0000249184B500486F27 /* WindowSurfaceCGL.h in Headers */, 31CD000D249184BB00486F27 /* WindowSurfaceEAGL.h in Headers */, 31CDFF512491848700486F27 /* xxhash.h in Headers */, ); @@ -3743,7 +3737,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - FFD0023B274497C4002BE3BC /* AddAndTrueToLoopCondition.cpp in Sources */, DF83E2502639FCD5000825EF /* AddExplicitTypeCasts.cpp in Sources */, DF83E2162639FC74000825EF /* aligned_memory.cpp in Sources */, 7B19599426C3C22000C09322 /* android_util.cpp in Sources */, @@ -3786,8 +3779,6 @@ DF83E2F32639FE17000825EF /* Context.cpp in Sources */, DF83E3122639FE17000825EF /* Context_gl.cpp in Sources */, DF83E31D2639FE17000825EF /* Context_gles_1_0.cpp in Sources */, - DF83E3632639FE92000825EF /* ContextCGL.cpp in Sources */, - DF83E3482639FE92000825EF /* ContextEAGL.cpp in Sources */, DF83E3582639FE92000825EF /* ContextGL.cpp in Sources */, DF83E39A2639FED4000825EF /* ContextImpl.cpp in Sources */, DF83E3772639FEB8000825EF /* ContextMtl.mm in Sources */, @@ -3800,8 +3791,6 @@ 3A0EBFBD2980BA41002C72BC /* DeclarePerVertexBlocks.cpp in Sources */, DF83E2852639FD33000825EF /* DeferGlobalInitializers.cpp in Sources */, DF83E32D2639FE18000825EF /* Device.cpp in Sources */, - DF83E3552639FE92000825EF /* DeviceCGL.cpp in Sources */, - DF83E3562639FE92000825EF /* DeviceEAGL.cpp in Sources */, DF83E3952639FED4000825EF /* DeviceImpl.cpp in Sources */, FFD0022727449647002BE3BC /* DeviceMtl.mm in Sources */, DF83E2D52639FD84000825EF /* Diagnostics.cpp in Sources */, @@ -3814,8 +3803,6 @@ DF83E3532639FE92000825EF /* DispatchTableGL_autogen.cpp in Sources */, DF83E3002639FE17000825EF /* Display.cpp in Sources */, DF83E3642639FE92000825EF /* DisplayApple_api.cpp in Sources */, - DF83E3462639FE92000825EF /* DisplayCGL.mm in Sources */, - DF83E3652639FE92000825EF /* DisplayEAGL.mm in Sources */, DF83E35D2639FE92000825EF /* DisplayGL.cpp in Sources */, DF83E3982639FED4000825EF /* DisplayImpl.cpp in Sources */, DF83E3762639FEB8000825EF /* DisplayMtl.mm in Sources */, @@ -3869,8 +3856,6 @@ DF83E3892639FEB8000825EF /* FrameBufferMtl.mm in Sources */, FFD0029327449D1D002BE3BC /* FrameCapture_mock.cpp in Sources */, DF83E2D72639FD84000825EF /* FunctionLookup.cpp in Sources */, - DF83E2252639FC80000825EF /* FunctionsCGL.cpp in Sources */, - DF83E34F2639FE92000825EF /* FunctionsEAGL.mm in Sources */, DF83E3572639FE92000825EF /* FunctionsGL.cpp in Sources */, DF83E2E82639FE17000825EF /* GLES1Renderer.cpp in Sources */, DF83E2ED2639FE17000825EF /* GLES1State.cpp in Sources */, @@ -3902,8 +3887,6 @@ DF83E2B72639FD83000825EF /* IntermRebuild.cpp in Sources */, DF83E2CF2639FD84000825EF /* IntermTraverse.cpp in Sources */, DF83E2412639FCD5000825EF /* IntroduceVertexIndexID.cpp in Sources */, - DF83E35A2639FE92000825EF /* IOSurfaceSurfaceCGL.cpp in Sources */, - DF83E3542639FE92000825EF /* IOSurfaceSurfaceEAGL.mm in Sources */, DF83E3752639FEB8000825EF /* IOSurfaceSurfaceMtl.mm in Sources */, DF83E29A2639FD83000825EF /* IsASTDepthBelowLimit.cpp in Sources */, DF83E24C2639FCD5000825EF /* Layout.cpp in Sources */, @@ -3957,8 +3940,6 @@ DF83E2222639FC74000825EF /* PackedEnums.cpp in Sources */, DF83E2132639FC74000825EF /* PackedGLEnums_autogen.cpp in Sources */, DF83E2BF2639FD83000825EF /* ParseContext.cpp in Sources */, - DF83E35B2639FE92000825EF /* PbufferSurfaceCGL.cpp in Sources */, - DF83E34C2639FE92000825EF /* PbufferSurfaceEAGL.cpp in Sources */, DF83E2352639FCD5000825EF /* Pipeline.cpp in Sources */, 3A7AA54E28E1319D009E09C2 /* PixelLocalStorage.cpp in Sources */, DF83E2E12639FE17000825EF /* Platform.cpp in Sources */, @@ -3991,7 +3972,6 @@ DF83E3192639FE17000825EF /* queryutils.cpp in Sources */, DF83E27A2639FD33000825EF /* RecordConstantPrecision.cpp in Sources */, DF83E23C2639FCD5000825EF /* ReduceInterfaceBlocks.cpp in Sources */, - FFD0024B274497CD002BE3BC /* RegenerateStructNames.cpp in Sources */, DF83E26F2639FD33000825EF /* RemoveArrayLengthMethod.cpp in Sources */, DF83E2622639FD33000825EF /* RemoveAtomicCounterBuiltins.cpp in Sources */, DF83E27B2639FD33000825EF /* RemoveDynamicIndexing.cpp in Sources */, @@ -4003,8 +3983,6 @@ 7B76083B289832BD000012A1 /* RenderbufferImpl.cpp in Sources */, DF83E3852639FEB8000825EF /* RenderBufferMtl.mm in Sources */, DF83E39C2639FED4000825EF /* renderer_utils.cpp in Sources */, - DF83E3492639FE92000825EF /* RendererCGL.cpp in Sources */, - DF83E3522639FE92000825EF /* RendererEAGL.cpp in Sources */, DF83E3672639FE92000825EF /* RendererGL.cpp in Sources */, DF83E36D2639FE92000825EF /* renderergl_utils.cpp in Sources */, 3AD0D2242988C96D0080D728 /* renderermtl_utils.cpp in Sources */, @@ -4019,17 +3997,14 @@ DF83E2472639FCD5000825EF /* RewriteCaseDeclarations.cpp in Sources */, DF83E2732639FD33000825EF /* RewriteCubeMapSamplersAs2DArray.cpp in Sources */, DF83E2632639FD33000825EF /* RewriteDfdy.cpp in Sources */, - FFD00236274497C4002BE3BC /* RewriteDoWhile.cpp in Sources */, DF83E2342639FCD5000825EF /* RewriteOutArgs.cpp in Sources */, DF83E2432639FCD5000825EF /* RewritePipelines.cpp in Sources */, 7B7608342898326C000012A1 /* RewritePixelLocalStorage.cpp in Sources */, FFD0024C274497CD002BE3BC /* RewriteRepeatedAssignToSwizzled.cpp in Sources */, - FFD00238274497C4002BE3BC /* RewriteRowMajorMatrices.cpp in Sources */, FF62F64527446DC800AD6EDC /* RewriteSampleMaskVariable.cpp in Sources */, DF83E2642639FD33000825EF /* RewriteStructSamplers.cpp in Sources */, DF83E2802639FD33000825EF /* RewriteTexelFetchOffset.cpp in Sources */, DF83E2402639FCD5000825EF /* RewriteUnaddressableReferences.cpp in Sources */, - FFD00233274497C4002BE3BC /* RewriteUnaryMinusOperatorFloat.cpp in Sources */, FF62F64A27446DC800AD6EDC /* RunAtTheBeginningOfShader.cpp in Sources */, DF83E2AD2639FD83000825EF /* RunAtTheEndOfShader.cpp in Sources */, DF83E3202639FE17000825EF /* Sampler.cpp in Sources */, @@ -4051,6 +4026,14 @@ DF83E3832639FEB8000825EF /* ShaderMtl.mm in Sources */, DF83E2952639FD83000825EF /* ShaderVars.cpp in Sources */, DF83E2532639FD33000825EF /* SimplifyLoopConditions.cpp in Sources */, + 7BFF6EE129E9908A009E1A57 /* SourcesCGL-mm.mm in Sources */, + 7BFF6EDE29E9908A009E1A57 /* SourcesCGL.cpp in Sources */, + 7BFF6EDD29E9908A009E1A57 /* SourcesEAGL.cpp in Sources */, + 7BFF6EE029E9908A009E1A57 /* SourcesEAGL1-mm.mm in Sources */, + 7BDC2D8129E9951900DF385C /* SourcesEAGL2-mm.mm in Sources */, + 7BFF6EE329E9908A009E1A57 /* SourcesGL.cpp in Sources */, + 7BFF6EE229E9908A009E1A57 /* SourcesPlatform-mm.mm in Sources */, + 7BFF6EDF29E9908A009E1A57 /* SourcesPlatform.cpp in Sources */, FF62F64127446DC800AD6EDC /* SpecializationConstant.cpp in Sources */, DF83E26E2639FD33000825EF /* SplitSequenceOperator.cpp in Sources */, DF83E2F02639FE17000825EF /* State.cpp in Sources */, @@ -4074,8 +4057,6 @@ DF83E21B2639FC74000825EF /* system_utils_posix.cpp in Sources */, DF83E2DA2639FD90000825EF /* SystemInfo.cpp in Sources */, DF83E2D82639FD90000825EF /* SystemInfo_apple.mm in Sources */, - DF83E2DB2639FD90000825EF /* SystemInfo_ios.cpp in Sources */, - DF83E2D92639FD90000825EF /* SystemInfo_macos.mm in Sources */, DF83E3172639FE17000825EF /* Texture.cpp in Sources */, DF83E35E2639FE92000825EF /* TextureGL.cpp in Sources */, DF83E3932639FED4000825EF /* TextureImpl.cpp in Sources */, @@ -4092,7 +4073,6 @@ DF83E2D22639FD84000825EF /* TranslatorGLSL.cpp in Sources */, DF83E2C52639FD84000825EF /* TranslatorMetalDirect.cpp in Sources */, DF83E2D02639FD84000825EF /* Types.cpp in Sources */, - FFD0023C274497C4002BE3BC /* UnfoldShortCircuitAST.cpp in Sources */, DF83E3262639FE18000825EF /* Uniform.cpp in Sources */, DF83E21C2639FC74000825EF /* uniform_type_info_autogen.cpp in Sources */, FFD00248274497CD002BE3BC /* UseInterfaceBlockFields.cpp in Sources */, @@ -4124,8 +4104,6 @@ 7B76083D289832BD000012A1 /* VertexArrayImpl.cpp in Sources */, DF83E3882639FEB8000825EF /* VertexArrayMtl.mm in Sources */, DF83E31C2639FE17000825EF /* VertexAttribute.cpp in Sources */, - DF83E3692639FE92000825EF /* WindowSurfaceCGL.mm in Sources */, - DF83E3512639FE92000825EF /* WindowSurfaceEAGL.mm in Sources */, 3A2C66F5292371B200FEDF46 /* WorkerThread.cpp in Sources */, DF83E2362639FCD5000825EF /* WrapMain.cpp in Sources */, 7B19599526C3C64E00C09322 /* xxhash.c in Sources */, diff --git a/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig b/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig index 13532b691260..b512e130a85e 100644 --- a/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig +++ b/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig @@ -29,9 +29,17 @@ PUBLIC_HEADERS_FOLDER_PATH[sdk=macosx*] = $(PUBLIC_HEADERS_FOLDER_PATH_$(WK_PLAT PUBLIC_HEADERS_FOLDER_PATH_macosx = $(ANGLE_HEADERS_FOLDER_PATH); PUBLIC_HEADERS_FOLDER_PATH_maccatalyst = $(WK_ALTERNATE_FRAMEWORKS_DIR)/$(ANGLE_HEADERS_FOLDER_PATH); -GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) LIBGLESV2_IMPLEMENTATION LIBANGLE_IMPLEMENTATION ANGLE_CAPTURE_ENABLED=0 ANGLE_ENABLE_OPENGL ANGLE_ENABLE_GLSL ANGLE_ENABLE_ESSL GL_SILENCE_DEPRECATION GLES_SILENCE_DEPRECATION ANGLE_ENABLE_METAL ANGLE_METAL_XCODE_BUILDS_SHADERS ANGLE_ENABLE_APPLE_WORKAROUNDS ANGLE_ENABLE_METAL_OWNERSHIP_IDENTITY; - -GCC_PREPROCESSOR_DEFINITIONS[sdk=macosx*] = $(DEBUG_DEFINES) LIBGLESV2_IMPLEMENTATION LIBANGLE_IMPLEMENTATION ANGLE_CAPTURE_ENABLED=0 ANGLE_ENABLE_OPENGL ANGLE_ENABLE_GLSL ANGLE_ENABLE_ESSL GL_SILENCE_DEPRECATION GLES_SILENCE_DEPRECATION ANGLE_ENABLE_METAL ANGLE_METAL_XCODE_BUILDS_SHADERS ANGLE_ENABLE_APPLE_WORKAROUNDS ANGLE_ENABLE_METAL_OWNERSHIP_IDENTITY ANGLE_ENABLE_GL_DESKTOP_BACKEND +GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) LIBGLESV2_IMPLEMENTATION LIBANGLE_IMPLEMENTATION ANGLE_CAPTURE_ENABLED=0 ANGLE_ENABLE_METAL ANGLE_METAL_XCODE_BUILDS_SHADERS ANGLE_ENABLE_METAL_OWNERSHIP_IDENTITY $(GCC_PREPROCESSOR_DEFINITIONS_$(WK_PLATFORM_NAME)); +GCC_PREPROCESSOR_DEFINITIONS_macosx = ANGLE_ENABLE_GLSL ANGLE_ENABLE_ESSL ANGLE_ENABLE_OPENGL ANGLE_ENABLE_GL_DESKTOP_BACKEND ANGLE_ENABLE_APPLE_WORKAROUNDS ANGLE_ENABLE_CGL GL_SILENCE_DEPRECATION +GCC_PREPROCESSOR_DEFINITIONS_maccatalyst = $(GCC_PREPROCESSOR_DEFINITIONS_macosx) +GCC_PREPROCESSOR_DEFINITIONS_maccatalyst[arch=arm*] = $(GCC_PREPROCESSOR_DEFINITIONS_macosx) ANGLE_ENABLE_EAGL GLES_SILENCE_DEPRECATION ANGLE_CPU_ARM64 +// FIXME: Rest of the iOS family does not need EAGL, these will be removed when upstream is able to compile without it. +GCC_PREPROCESSOR_DEFINITIONS_iphoneos = ANGLE_ENABLE_GLSL ANGLE_ENABLE_ESSL ANGLE_ENABLE_OPENGL ANGLE_ENABLE_APPLE_WORKAROUNDS ANGLE_ENABLE_EAGL GLES_SILENCE_DEPRECATION +GCC_PREPROCESSOR_DEFINITIONS_iphonesimulator = $(GCC_PREPROCESSOR_DEFINITIONS_iphoneos); +GCC_PREPROCESSOR_DEFINITIONS_watchos = $(GCC_PREPROCESSOR_DEFINITIONS_iphoneos); +GCC_PREPROCESSOR_DEFINITIONS_watchsimulator = $(GCC_PREPROCESSOR_DEFINITIONS_iphoneos); +GCC_PREPROCESSOR_DEFINITIONS_appletvos = $(GCC_PREPROCESSOR_DEFINITIONS_iphoneos); +GCC_PREPROCESSOR_DEFINITIONS_appletvsimulator = $(GCC_PREPROCESSOR_DEFINITIONS_iphoneos); DEAD_CODE_STRIPPING = YES; DEAD_CODE_STRIPPING[config=Debug] = NO; diff --git a/Source/ThirdParty/ANGLE/WebKit/SourcesCGL-mm.mm b/Source/ThirdParty/ANGLE/WebKit/SourcesCGL-mm.mm new file mode 100644 index 000000000000..9c879aa6e432 --- /dev/null +++ b/Source/ThirdParty/ANGLE/WebKit/SourcesCGL-mm.mm @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2023 Apple Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "common/platform.h" + +#if ANGLE_ENABLE_CGL +#import "libANGLE/renderer/gl/cgl/DisplayCGL.mm" +#import "libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm" +#endif diff --git a/Source/ThirdParty/ANGLE/WebKit/SourcesCGL.cpp b/Source/ThirdParty/ANGLE/WebKit/SourcesCGL.cpp new file mode 100644 index 000000000000..a03046c2f9f0 --- /dev/null +++ b/Source/ThirdParty/ANGLE/WebKit/SourcesCGL.cpp @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2023 Apple Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "common/platform.h" + +#if ANGLE_ENABLE_CGL +#include "libANGLE/renderer/gl/cgl/DeviceCGL.cpp" +#include "libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.cpp" +#include "libANGLE/renderer/gl/cgl/ContextCGL.cpp" +#include "libANGLE/renderer/gl/cgl/RendererCGL.cpp" +#include "libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.cpp" +#include "common/gl/cgl/FunctionsCGL.cpp" +#endif diff --git a/Source/ThirdParty/ANGLE/WebKit/SourcesEAGL.cpp b/Source/ThirdParty/ANGLE/WebKit/SourcesEAGL.cpp new file mode 100644 index 000000000000..0416a5886c9b --- /dev/null +++ b/Source/ThirdParty/ANGLE/WebKit/SourcesEAGL.cpp @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2023 Apple Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "common/platform.h" + +#if ANGLE_ENABLE_EAGL +#include "libANGLE/renderer/gl/eagl/ContextEAGL.cpp" +#include "libANGLE/renderer/gl/eagl/DeviceEAGL.cpp" +#include "libANGLE/renderer/gl/eagl/PbufferSurfaceEAGL.cpp" +#include "libANGLE/renderer/gl/eagl/RendererEAGL.cpp" +#endif diff --git a/Source/ThirdParty/ANGLE/WebKit/SourcesEAGL1-mm.mm b/Source/ThirdParty/ANGLE/WebKit/SourcesEAGL1-mm.mm new file mode 100644 index 000000000000..f9d49b425773 --- /dev/null +++ b/Source/ThirdParty/ANGLE/WebKit/SourcesEAGL1-mm.mm @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2023 Apple Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#import "common/platform.h" + +#if ANGLE_ENABLE_EAGL +#import "libANGLE/renderer/gl/eagl/DisplayEAGL.mm" +#import "libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.mm" +#import "libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.mm" +#endif diff --git a/Source/ThirdParty/ANGLE/WebKit/SourcesEAGL2-mm.mm b/Source/ThirdParty/ANGLE/WebKit/SourcesEAGL2-mm.mm new file mode 100644 index 000000000000..c2264459a02d --- /dev/null +++ b/Source/ThirdParty/ANGLE/WebKit/SourcesEAGL2-mm.mm @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2023 Apple Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#import "common/platform.h" + +#if ANGLE_ENABLE_EAGL +#import "libANGLE/renderer/gl/eagl/FunctionsEAGL.mm" +#endif diff --git a/Source/ThirdParty/ANGLE/WebKit/SourcesGL.cpp b/Source/ThirdParty/ANGLE/WebKit/SourcesGL.cpp new file mode 100644 index 000000000000..0412a766f115 --- /dev/null +++ b/Source/ThirdParty/ANGLE/WebKit/SourcesGL.cpp @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2023 Apple Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "common/platform.h" + +#if ANGLE_ENABLE_GLSL && ANGLE_ENABLE_APPLE_WORKAROUNDS +#include "compiler/translator/tree_ops/apple/AddAndTrueToLoopCondition.cpp" +#include "compiler/translator/tree_ops/apple/RewriteDoWhile.cpp" +#include "compiler/translator/tree_ops/apple/RewriteRowMajorMatrices.cpp" +#include "compiler/translator/tree_ops/apple/RewriteUnaryMinusOperatorFloat.cpp" +#include "compiler/translator/tree_ops/apple/UnfoldShortCircuitAST.cpp" +#endif +#if ANGLE_ENABLE_GLSL +#include "compiler/translator/tree_ops/gl/RegenerateStructNames.cpp" +#endif \ No newline at end of file diff --git a/Source/ThirdParty/ANGLE/WebKit/SourcesPlatform-mm.mm b/Source/ThirdParty/ANGLE/WebKit/SourcesPlatform-mm.mm new file mode 100644 index 000000000000..78ca284de371 --- /dev/null +++ b/Source/ThirdParty/ANGLE/WebKit/SourcesPlatform-mm.mm @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2023 Apple Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "common/platform.h" + +#if ANGLE_PLATFORM_MACOS || ANGLE_PLATFORM_MACCATALYST +#include "gpu_info_util/SystemInfo_macos.mm" +#endif diff --git a/Source/ThirdParty/ANGLE/WebKit/SourcesPlatform.cpp b/Source/ThirdParty/ANGLE/WebKit/SourcesPlatform.cpp new file mode 100644 index 000000000000..8b96dc01357f --- /dev/null +++ b/Source/ThirdParty/ANGLE/WebKit/SourcesPlatform.cpp @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2023 Apple Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "common/platform.h" + +#if !(ANGLE_PLATFORM_MACOS || ANGLE_PLATFORM_MACCATALYST) +#include "gpu_info_util/SystemInfo_ios.cpp" +#endif diff --git a/Source/ThirdParty/ANGLE/src/common/platform.h b/Source/ThirdParty/ANGLE/src/common/platform.h index eb6bc95eac17..a1491052b3e1 100644 --- a/Source/ThirdParty/ANGLE/src/common/platform.h +++ b/Source/ThirdParty/ANGLE/src/common/platform.h @@ -145,17 +145,6 @@ # define ANGLE_PLATFORM_IOS_SIMULATOR 1 # endif # -# // This might be useful globally. At the moment it is used -# // to differentiate MacCatalyst on Intel and Apple Silicon. -# if defined(__arm64__) || defined(__aarch64__) -# define ANGLE_CPU_ARM64 1 -# endif -# // EAGL should be enabled on iOS, but not Mac Catalyst unless it is running on Apple Silicon. -# if ((defined(ANGLE_PLATFORM_IOS) || defined(ANGLE_PLATFORM_WATCH) \ - || defined(ANGLE_PLATFORM_APPLETV)) && !defined(ANGLE_PLATFORM_MACCATALYST)) || \ - (defined(ANGLE_PLATFORM_MACCATALYST) && defined(ANGLE_CPU_ARM64)) -# define ANGLE_ENABLE_EAGL -# endif # // Identify Metal API >= what shipped on macOS Catalina. # if (defined(ANGLE_PLATFORM_MACOS) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101500) || \ (defined(ANGLE_PLATFORM_IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000) diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp index dcc10a528845..1a21083aa3d7 100644 --- a/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp +++ b/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp @@ -342,7 +342,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib displayType, impl = new rx::DisplayWGL(state); break; -# elif defined(ANGLE_PLATFORM_MACOS) || defined(ANGLE_PLATFORM_APPLE_EMBEDDED) +# elif ANGLE_ENABLE_CGL || ANGLE_ENABLE_EAGL impl = rx::CreateDisplayCGLOrEAGL(state); break; diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/apple/DisplayApple_api.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/apple/DisplayApple_api.cpp index e38160a76362..4ea6d397d45d 100644 --- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/apple/DisplayApple_api.cpp +++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/apple/DisplayApple_api.cpp @@ -10,6 +10,7 @@ #ifndef LIBANGLE_RENDERER_GL_APPLE_DISPLAYAPPLE_API_H_ #define LIBANGLE_RENDERER_GL_APPLE_DISPLAYAPPLE_API_H_ +#include "common/platform.h" #include "gpu_info_util/SystemInfo.h" #include "libANGLE/renderer/DisplayImpl.h"