WebKit Bugzilla
New
Browse
Search+
Log In
×
Sign in with GitHub
or
Remember my login
Create Account
·
Forgot Password
Forgotten password account recovery
[patch]
WIP3
wip3.patch (text/plain), 59.25 KB, created by
Dean Jackson
on 2020-09-20 03:37:13 PDT
(
hide
)
Description:
WIP3
Filename:
MIME Type:
Creator:
Dean Jackson
Created:
2020-09-20 03:37:13 PDT
Size:
59.25 KB
patch
obsolete
>diff --git a/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj b/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj >index e9e50b9f2571..e8e690ddd656 100644 >--- a/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj >+++ b/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj >@@ -150,12 +150,6 @@ > 315EBE241FCE462A00AC7A89 /* safe_math_impl.h in Headers */ = {isa = PBXBuildFile; fileRef = 315EBE201FCE462A00AC7A89 /* safe_math_impl.h */; }; > 315EBE281FCF808C00AC7A89 /* PMurHash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 315EBE261FCF808C00AC7A89 /* PMurHash.cpp */; }; > 315EBE291FCF808C00AC7A89 /* PMurHash.h in Headers */ = {isa = PBXBuildFile; fileRef = 315EBE271FCF808C00AC7A89 /* PMurHash.h */; }; >- 31647F9F2511A1A60010F8FB /* SystemInfo_apple.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31647F9E2511A1A60010F8FB /* SystemInfo_apple.cpp */; }; >- 31647FA02511A1A60010F8FB /* SystemInfo_apple.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31647F9E2511A1A60010F8FB /* SystemInfo_apple.cpp */; }; >- 31647FA42515978D0010F8FB /* CGLFunctions.h in Headers */ = {isa = PBXBuildFile; fileRef = 31647FA22515978D0010F8FB /* CGLFunctions.h */; }; >- 31647FA52515978D0010F8FB /* CGLFunctions.h in Headers */ = {isa = PBXBuildFile; fileRef = 31647FA22515978D0010F8FB /* CGLFunctions.h */; }; >- 31647FA62515978D0010F8FB /* CGLFunctions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31647FA32515978D0010F8FB /* CGLFunctions.cpp */; }; >- 31647FA72515978D0010F8FB /* CGLFunctions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31647FA32515978D0010F8FB /* CGLFunctions.cpp */; }; > 31A331C21EA5ED2500FD2203 /* bitset_utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 31A331C01EA5ED2500FD2203 /* bitset_utils.h */; }; > 31A331C61EA5ED5F00FD2203 /* system_utils_mac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31A331C31EA5ED5F00FD2203 /* system_utils_mac.cpp */; }; > 31A331C71EA5ED5F00FD2203 /* system_utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 31A331C41EA5ED5F00FD2203 /* system_utils.h */; }; >@@ -1553,7 +1547,6 @@ > /* End PBXCopyFilesBuildPhase section */ > > /* Begin PBXFileReference section */ >- 0F85DA2F25137808000A500B /* SoftLinking_apple.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SoftLinking_apple.h; sourceTree = "<group>"; }; > 31012DA018B97B9B0039062F /* BaseTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseTypes.h; sourceTree = "<group>"; }; > 31012DA118B97B9B0039062F /* BuiltInFunctionEmulator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BuiltInFunctionEmulator.cpp; sourceTree = "<group>"; }; > 31012DA218B97B9B0039062F /* BuiltInFunctionEmulator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BuiltInFunctionEmulator.h; sourceTree = "<group>"; }; >@@ -1688,9 +1681,6 @@ > 315EBE201FCE462A00AC7A89 /* safe_math_impl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = safe_math_impl.h; sourceTree = "<group>"; }; > 315EBE261FCF808C00AC7A89 /* PMurHash.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PMurHash.cpp; sourceTree = "<group>"; }; > 315EBE271FCF808C00AC7A89 /* PMurHash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PMurHash.h; sourceTree = "<group>"; }; >- 31647F9E2511A1A60010F8FB /* SystemInfo_apple.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SystemInfo_apple.cpp; sourceTree = "<group>"; }; >- 31647FA22515978D0010F8FB /* CGLFunctions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CGLFunctions.h; sourceTree = "<group>"; }; >- 31647FA32515978D0010F8FB /* CGLFunctions.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CGLFunctions.cpp; sourceTree = "<group>"; }; > 31A331C01EA5ED2500FD2203 /* bitset_utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bitset_utils.h; sourceTree = "<group>"; }; > 31A331C31EA5ED5F00FD2203 /* system_utils_mac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = system_utils_mac.cpp; sourceTree = "<group>"; }; > 31A331C41EA5ED5F00FD2203 /* system_utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = system_utils.h; sourceTree = "<group>"; }; >@@ -2982,7 +2972,6 @@ > 5CB301111DE39F1A00D2C405 /* TransformFeedbackGL.h */, > 5CB301121DE39F1A00D2C405 /* VertexArrayGL.cpp */, > 5CB301131DE39F1A00D2C405 /* VertexArrayGL.h */, >- 0F85DA2F25137808000A500B /* SoftLinking_apple.h */, > ); > path = gl; > sourceTree = "<group>"; >@@ -2990,8 +2979,6 @@ > 5CB301481DE39F3600D2C405 /* cgl */ = { > isa = PBXGroup; > children = ( >- 31647FA22515978D0010F8FB /* CGLFunctions.h */, >- 31647FA32515978D0010F8FB /* CGLFunctions.cpp */, > 5CCD59722284FA820018F2D8 /* ContextCGL.cpp */, > 5CCD59752284FA820018F2D8 /* ContextCGL.h */, > 6E31A0A1234EEED400C84784 /* DeviceCGL.cpp */, >@@ -3223,7 +3210,6 @@ > 5CCD59992284FC750018F2D8 /* SystemInfo.h */, > 31B15721236B803300CAA4FD /* SystemInfo_internal.h */, > 31B1571F236B7FAE00CAA4FD /* SystemInfo_ios.cpp */, >- 31647F9E2511A1A60010F8FB /* SystemInfo_apple.cpp */, > 5CCD59972284FC750018F2D8 /* SystemInfo_macos.mm */, > ); > name = gpuinfoutil; >@@ -3435,7 +3421,6 @@ > 31CDFF5B2491848C00486F27 /* Color.h in Headers */, > 31CDFFE4249184A700486F27 /* Common.h in Headers */, > 31CD006C249184FC00486F27 /* Compiler.h in Headers */, >- 31647FA52515978D0010F8FB /* CGLFunctions.h in Headers */, > 31CDFFE7249184A700486F27 /* Compiler.h in Headers */, > 31CD0015249184E700486F27 /* CompilerGL.h in Headers */, > 31CD003F249184F400486F27 /* CompilerImpl.h in Headers */, >@@ -3841,7 +3826,6 @@ > 5CCD818E1DBFEA10006066B8 /* Color.h in Headers */, > 31012E1618B97B9B0039062F /* Common.h in Headers */, > 5C1DBDDD1B0438D300235552 /* Compiler.h in Headers */, >- 31647FA42515978D0010F8FB /* CGLFunctions.h in Headers */, > 5C1DBC2C1B04375F00235552 /* Compiler.h in Headers */, > 5CB3011B1DE39F1A00D2C405 /* CompilerGL.h in Headers */, > 5CB304DC1DE4164800D2C405 /* CompilerImpl.h in Headers */, >@@ -4449,7 +4433,6 @@ > 31CDFE952491843A00486F27 /* IsASTDepthBelowLimit.cpp in Sources */, > 31CDFE302491842800486F27 /* Lexer.cpp in Sources */, > 31CDFEDC2491845800486F27 /* load_functions_table_autogen.cpp in Sources */, >- 31647FA02511A1A60010F8FB /* SystemInfo_apple.cpp in Sources */, > 31CDFEB22491844200486F27 /* loadimage.cpp in Sources */, > 31CDFEB42491844200486F27 /* loadimage_etc.cpp in Sources */, > 31CDFF1F2491845F00486F27 /* LoggingAnnotator.cpp in Sources */, >@@ -4458,7 +4441,6 @@ > 31CDFE192491842300486F27 /* mathutil.cpp in Sources */, > 31CDFE1A2491842300486F27 /* matrix_utils.cpp in Sources */, > 31CDFE1B2491842300486F27 /* MemoryBuffer.cpp in Sources */, >- 31647FA72515978D0010F8FB /* CGLFunctions.cpp in Sources */, > 31CDFEEA2491845F00486F27 /* MemoryObject.cpp in Sources */, > 31CDFED22491845300486F27 /* MemoryObjectGL.cpp in Sources */, > 31CDFF0E2491845F00486F27 /* MemoryProgramCache.cpp in Sources */, >@@ -4784,7 +4766,6 @@ > 315EBD9C1FCE443600AC7A89 /* IsASTDepthBelowLimit.cpp in Sources */, > A264F8B616974DED006FAA5A /* Lexer.cpp in Sources */, > 5CB304EF1DE4164800D2C405 /* load_functions_table_autogen.cpp in Sources */, >- 31647F9F2511A1A60010F8FB /* SystemInfo_apple.cpp in Sources */, > 5CCD59952284FC400018F2D8 /* loadimage.cpp in Sources */, > 5CCD59922284FC400018F2D8 /* loadimage_etc.cpp in Sources */, > 315EBDE81FCE452D00AC7A89 /* LoggingAnnotator.cpp in Sources */, >@@ -4793,7 +4774,6 @@ > 5CC7D47219102621000B8C1F /* mathutil.cpp in Sources */, > 5C55D7252282747700B5BA2C /* matrix_utils.cpp in Sources */, > 5C1DBBF11B0436EC00235552 /* MemoryBuffer.cpp in Sources */, >- 31647FA62515978D0010F8FB /* CGLFunctions.cpp in Sources */, > 5CCD59642284F7960018F2D8 /* MemoryObject.cpp in Sources */, > A303078B2305F8F0002DA972 /* MemoryObjectGL.cpp in Sources */, > 315EBDF31FCE452D00AC7A89 /* MemoryProgramCache.cpp in Sources */, >diff --git a/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig b/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig >index 907c4a2b1555..31582b922bdf 100644 >--- a/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig >+++ b/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig >@@ -11,7 +11,7 @@ ANGLE_OTHER_LDFLAGS_watchos = $(ANGLE_OTHER_LDFLAGS_iphoneos); > ANGLE_OTHER_LDFLAGS_watchsimulator = $(ANGLE_OTHER_LDFLAGS_iphonesimulator); > ANGLE_OTHER_LDFLAGS_appletvos = $(ANGLE_OTHER_LDFLAGS_iphoneos); > ANGLE_OTHER_LDFLAGS_appletvsimulator = $(ANGLE_OTHER_LDFLAGS_iphonesimulator); >-ANGLE_OTHER_LDFLAGS_maccatalyst = -framework IOKit -lz; >+ANGLE_OTHER_LDFLAGS_maccatalyst = -framework IOKit -framework OpenGL -lz; > ANGLE_OTHER_LDFLAGS_macosx = -framework IOKit -framework OpenGL -lz; > > INSTALL_PATH = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks; >diff --git a/Source/ThirdParty/ANGLE/Configurations/ANGLE-static.xcconfig b/Source/ThirdParty/ANGLE/Configurations/ANGLE-static.xcconfig >index 18d2b43fb65f..4d1d2211935a 100644 >--- a/Source/ThirdParty/ANGLE/Configurations/ANGLE-static.xcconfig >+++ b/Source/ThirdParty/ANGLE/Configurations/ANGLE-static.xcconfig >@@ -11,7 +11,7 @@ ANGLE_OTHER_LDFLAGS_watchos = $(ANGLE_OTHER_LDFLAGS_iphoneos); > ANGLE_OTHER_LDFLAGS_watchsimulator = $(ANGLE_OTHER_LDFLAGS_iphonesimulator); > ANGLE_OTHER_LDFLAGS_appletvos = $(ANGLE_OTHER_LDFLAGS_iphoneos); > ANGLE_OTHER_LDFLAGS_appletvsimulator = $(ANGLE_OTHER_LDFLAGS_iphonesimulator); >-ANGLE_OTHER_LDFLAGS_maccatalyst = -framework IOKit -framework IOSurface -lz; >+ANGLE_OTHER_LDFLAGS_maccatalyst = -framework IOKit -framework IOSurface -framework OpenGL -lz; > ANGLE_OTHER_LDFLAGS_macosx = -framework IOKit -framework IOSurface -framework OpenGL -lz; > > INSTALL_PATH = $(ANGLE_INSTALL_PATH_PREFIX)/usr/local/lib; >diff --git a/Source/ThirdParty/ANGLE/GLESv2.cmake b/Source/ThirdParty/ANGLE/GLESv2.cmake >index 4fbdbcb8ce20..04fbe9efe7c9 100644 >--- a/Source/ThirdParty/ANGLE/GLESv2.cmake >+++ b/Source/ThirdParty/ANGLE/GLESv2.cmake >@@ -167,9 +167,7 @@ set(libangle_gpu_info_util_libpci_sources > set(libangle_gpu_info_util_x11_sources "src/gpu_info_util/SystemInfo_x11.cpp" ) > > >-set(libangle_gpu_info_util_mac_sources >- "src/gpu_info_util/SystemInfo_apple.mm" >- "src/gpu_info_util/SystemInfo_macos.mm" ) >+set(libangle_gpu_info_util_mac_sources "src/gpu_info_util/SystemInfo_macos.mm" ) > > > set(libangle_includes >diff --git a/Source/ThirdParty/ANGLE/src/common/platform.h b/Source/ThirdParty/ANGLE/src/common/platform.h >index 9d2533484868..0416ed201d59 100644 >--- a/Source/ThirdParty/ANGLE/src/common/platform.h >+++ b/Source/ThirdParty/ANGLE/src/common/platform.h >@@ -128,11 +128,6 @@ > # define ANGLE_PLATFORM_MACCATALYST > # endif > # 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 >-# endif > #endif > > // Define ANGLE_WITH_ASAN macro. >diff --git a/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_ios.cpp b/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_ios.cpp >index bd22197062e8..c0d436f5618c 100644 >--- a/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_ios.cpp >+++ b/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_ios.cpp >@@ -8,14 +8,14 @@ > > #include "common/platform.h" > >-#if defined(ANGLE_PLATFORM_IOS) || (defined(ANGLE_PLATFORM_MACCATALYST) && defined(ANGLE_CPU_ARM64)) >+#if defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST) > > # include "gpu_info_util/SystemInfo_internal.h" > > namespace angle > { > >-bool GetSystemInfo_ios(SystemInfo *info) >+bool GetSystemInfo(SystemInfo *info) > { > { > // TODO(anglebug.com/4275): Get the actual system version. >@@ -27,4 +27,4 @@ bool GetSystemInfo_ios(SystemInfo *info) > > } // namespace angle > >-#endif // defined(ANGLE_PLATFORM_IOS) || (defined(ANGLE_PLATFORM_MACCATALYST) && defined(ANGLE_CPU_ARM64)) >+#endif // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST) >diff --git a/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_macos.mm b/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_macos.mm >index 2ab92fc764df..a8ed7af26f42 100644 >--- a/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_macos.mm >+++ b/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_macos.mm >@@ -15,8 +15,6 @@ > # import <Cocoa/Cocoa.h> > # import <IOKit/IOKitLib.h> > >-# include "libANGLE/renderer/gl/cgl/CGLFunctions.h" >- > namespace angle > { > >@@ -210,7 +208,7 @@ uint64_t GetGpuIDFromOpenGLDisplayMask(uint32_t displayMask) > return 0; > } > >-bool GetSystemInfo_mac(SystemInfo *info) >+bool GetSystemInfo(SystemInfo *info) > { > { > int32_t major = 0; >diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp >index fff68d635066..e3ebe325daa2 100644 >--- a/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp >+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp >@@ -53,9 +53,6 @@ > # include "libANGLE/renderer/gl/wgl/DisplayWGL.h" > # elif defined(ANGLE_PLATFORM_MACOS) || defined(ANGLE_PLATFORM_MACCATALYST) > # include "libANGLE/renderer/gl/cgl/DisplayCGL.h" >-# if defined(ANGLE_PLATFORM_MACCATALYST) && defined(ANGLE_CPU_ARM64) >-# include "libANGLE/renderer/gl/eagl/DisplayEAGL.h" >-# endif > # elif defined(ANGLE_PLATFORM_IOS) > # include "libANGLE/renderer/gl/eagl/DisplayEAGL.h" > # elif defined(ANGLE_PLATFORM_LINUX) >@@ -263,28 +260,8 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib displayType, > #if defined(ANGLE_ENABLE_OPENGL) > # if defined(ANGLE_PLATFORM_WINDOWS) > impl = new rx::DisplayWGL(state); >- break; >- >-# elif defined(ANGLE_PLATFORM_MACOS) >- impl = new rx::DisplayCGL(state); >- break; >-# elif defined(ANGLE_PLATFORM_MACCATALYST) >-# if defined(ANGLE_CPU_ARM64) >-# // FIXME: Decide at runtime >- if ((0)) // running iOS stuff >- { >- impl = new rx::DisplayCGL(state); >- break; >- } >- else >- { >- impl = new rx::DisplayEAGL(state); >- break; >- } >-# else >+# elif defined(ANGLE_PLATFORM_MACOS) || defined(ANGLE_PLATFORM_MACCATALYST) > impl = new rx::DisplayCGL(state); >- break; >-# endif > # elif defined(ANGLE_PLATFORM_IOS) > impl = new rx::DisplayEAGL(state); > # elif defined(ANGLE_PLATFORM_LINUX) >diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/formatutils.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/formatutils.cpp >index 2d3fe41e0156..e43496fc3471 100644 >--- a/Source/ThirdParty/ANGLE/src/libANGLE/formatutils.cpp >+++ b/Source/ThirdParty/ANGLE/src/libANGLE/formatutils.cpp >@@ -1030,8 +1030,7 @@ static InternalFormatInfoMap BuildInternalFormatInfoMap() > AddRGBAFormat(&map, GL_RGBA, false, 8, 8, 8, 8, 0, GL_RGBA, GL_BYTE, GL_SIGNED_NORMALIZED, false, NeverSupported, NeverSupported, NeverSupported, NeverSupported, NeverSupported); > AddRGBAFormat(&map, GL_SRGB, false, 8, 8, 8, 0, 0, GL_SRGB, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, true, RequireExt<&Extensions::sRGB>, AlwaysSupported, NeverSupported, NeverSupported, NeverSupported); > AddRGBAFormat(&map, GL_SRGB_ALPHA_EXT, false, 8, 8, 8, 8, 0, GL_SRGB_ALPHA_EXT, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, true, RequireExt<&Extensions::sRGB>, AlwaysSupported, RequireExt<&Extensions::sRGB>, NeverSupported, NeverSupported); >-#if defined(ANGLE_PLATFORM_IOS) >- // I think this needs a runtime check too. >+#if defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST) > AddRGBAFormat(&map, GL_BGRA_EXT, false, 8, 8, 8, 8, 0, GL_BGRA_EXT, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, RequireES<2, 0>, AlwaysSupported, RequireES<2, 0>, NeverSupported, NeverSupported); > #else > AddRGBAFormat(&map, GL_BGRA_EXT, false, 8, 8, 8, 8, 0, GL_BGRA_EXT, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::textureFormatBGRA8888>, AlwaysSupported, RequireExt<&Extensions::textureFormatBGRA8888>, NeverSupported, NeverSupported); >diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/CGLFunctions.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/CGLFunctions.cpp >deleted file mode 100644 >index 38859063d118..000000000000 >--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/CGLFunctions.cpp >+++ /dev/null >@@ -1,32 +0,0 @@ >-// >-// Copyright 2020 Apple, Inc. All rights reserved. >-// Use of this source code is governed by a BSD-style license that can be >-// found in the LICENSE file. >-// >- >-// CGLFunctions.cpp: Exposing the soft-linked CGL interface. >- >-#include "common/platform.h" >-#include "libANGLE/renderer/gl/cgl/CGLFunctions.h" >- >-#if defined(ANGLE_PLATFORM_APPLE) >- >-SOFT_LINK_FRAMEWORK_SOURCE(OpenGL) >- >-SOFT_LINK_FUNCTION_SOURCE(OpenGL, CGLChoosePixelFormat, CGLError, (const CGLPixelFormatAttribute *attribs, CGLPixelFormatObj *pix, GLint *npix), (attribs, pix, npix)) >-SOFT_LINK_FUNCTION_SOURCE(OpenGL, CGLCreateContext, CGLError, (CGLPixelFormatObj pix, CGLContextObj share, CGLContextObj *ctx), (pix, share, ctx)) >-SOFT_LINK_FUNCTION_SOURCE(OpenGL, CGLDescribePixelFormat, CGLError, (CGLPixelFormatObj pix, GLint pix_num, CGLPixelFormatAttribute attrib, GLint *value), (pix, pix_num, attrib, value)) >-SOFT_LINK_FUNCTION_SOURCE(OpenGL, CGLDestroyContext, CGLError, (CGLContextObj ctx), (ctx)) >-SOFT_LINK_FUNCTION_SOURCE(OpenGL, CGLDestroyPixelFormat, CGLError, (CGLPixelFormatObj pix), (pix)) >-SOFT_LINK_FUNCTION_SOURCE(OpenGL, CGLErrorString, const char *, (CGLError error), (error)) >-SOFT_LINK_FUNCTION_SOURCE(OpenGL, CGLReleaseContext, void, (CGLContextObj ctx), (ctx)) >-SOFT_LINK_FUNCTION_SOURCE(OpenGL, CGLSetCurrentContext, CGLError, (CGLContextObj ctx), (ctx)) >-SOFT_LINK_FUNCTION_SOURCE(OpenGL, CGLSetVirtualScreen, CGLError, (CGLContextObj ctx, GLint screen), (ctx, screen)) >-SOFT_LINK_FUNCTION_SOURCE(OpenGL, CGLTexImageIOSurface2D, CGLError, (CGLContextObj ctx, GLenum target, GLenum internal_format, GLsizei width, GLsizei height, GLenum format, GLenum type, IOSurfaceRef ioSurface, GLuint plane), (ctx, target, internal_format, width, height, format, type, ioSurface, plane)) >-SOFT_LINK_FUNCTION_SOURCE(OpenGL, CGLUpdateContext, CGLError, (CGLContextObj ctx), (ctx)) >- >-SOFT_LINK_FUNCTION_SOURCE(OpenGL, CGLDescribeRenderer, CGLError, (CGLRendererInfoObj rend, GLint rend_num, CGLRendererProperty prop, GLint *value), (rend, rend_num, prop, value)) >-SOFT_LINK_FUNCTION_SOURCE(OpenGL, CGLDestroyRendererInfo, CGLError, (CGLRendererInfoObj rend), (rend)) >-SOFT_LINK_FUNCTION_SOURCE(OpenGL, CGLQueryRendererInfo, CGLError, (GLuint display_mask, CGLRendererInfoObj *rend, GLint *nrend), (display_mask, rend, nrend)) >- >-#endif // defined(ANGLE_PLATFORM_APPLE) >diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/CGLFunctions.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/CGLFunctions.h >deleted file mode 100644 >index 4d44ff5e8ae9..000000000000 >--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/CGLFunctions.h >+++ /dev/null >@@ -1,39 +0,0 @@ >-// >-// Copyright 2020 Apple, Inc. All rights reserved. >-// Use of this source code is governed by a BSD-style license that can be >-// found in the LICENSE file. >-// >- >-// SoftLinking_apple.cpp: Macros for soft-linking Frameworks and Functions. >- >-#ifndef CGL_FUNCTIONS_H_ >-#define CGL_FUNCTIONS_H_ >- >-#include "common/platform.h" >- >-#if defined(ANGLE_PLATFORM_APPLE) >- >-#include <OpenGL/OpenGL.h> >- >-#include "libANGLE/renderer/gl/SoftLinking_apple.h" >- >-SOFT_LINK_FRAMEWORK_HEADER(OpenGL) >- >-SOFT_LINK_FUNCTION_HEADER(OpenGL, CGLChoosePixelFormat, CGLError, (const CGLPixelFormatAttribute *attribs, CGLPixelFormatObj *pix, GLint *npix), (attribs, pix, npix)) >-SOFT_LINK_FUNCTION_HEADER(OpenGL, CGLCreateContext, CGLError, (CGLPixelFormatObj pix, CGLContextObj share, CGLContextObj *ctx), (pix, share, ctx)) >-SOFT_LINK_FUNCTION_HEADER(OpenGL, CGLDescribePixelFormat, CGLError, (CGLPixelFormatObj pix, GLint pix_num, CGLPixelFormatAttribute attrib, GLint *value), (pix, pix_num, attrib, value)) >-SOFT_LINK_FUNCTION_HEADER(OpenGL, CGLDescribeRenderer, CGLError, (CGLRendererInfoObj rend, GLint rend_num, CGLRendererProperty prop, GLint *value), (rend, rend_num, prop, value)) >-SOFT_LINK_FUNCTION_HEADER(OpenGL, CGLDestroyContext, CGLError, (CGLContextObj ctx), (ctx)) >-SOFT_LINK_FUNCTION_HEADER(OpenGL, CGLDestroyPixelFormat, CGLError, (CGLPixelFormatObj pix), (pix)) >-SOFT_LINK_FUNCTION_HEADER(OpenGL, CGLDestroyRendererInfo, CGLError, (CGLRendererInfoObj rend), (rend)) >-SOFT_LINK_FUNCTION_HEADER(OpenGL, CGLErrorString, const char *, (CGLError error), (error)) >-SOFT_LINK_FUNCTION_HEADER(OpenGL, CGLQueryRendererInfo, CGLError, (GLuint display_mask, CGLRendererInfoObj *rend, GLint *nrend), (display_mask, rend, nrend)) >-SOFT_LINK_FUNCTION_HEADER(OpenGL, CGLReleaseContext, void, (CGLContextObj ctx), (ctx)) >-SOFT_LINK_FUNCTION_HEADER(OpenGL, CGLSetCurrentContext, CGLError, (CGLContextObj ctx), (ctx)) >-SOFT_LINK_FUNCTION_HEADER(OpenGL, CGLSetVirtualScreen, CGLError, (CGLContextObj ctx, GLint screen), (ctx, screen)) >-SOFT_LINK_FUNCTION_HEADER(OpenGL, CGLTexImageIOSurface2D, CGLError, (CGLContextObj ctx, GLenum target, GLenum internal_format, GLsizei width, GLsizei height, GLenum format, GLenum type, IOSurfaceRef ioSurface, GLuint plane), (ctx, target, internal_format, width, height, format, type, ioSurface, plane)) >-SOFT_LINK_FUNCTION_HEADER(OpenGL, CGLUpdateContext, CGLError, (CGLContextObj ctx), (ctx)) >- >-#endif // defined(ANGLE_PLATFORM_APPLE) >- >-#endif // CGL_FUNCTIONS_H_ >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 e7cc2ba2fa63..79a11d4d298a 100644 >--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/DisplayCGL.mm >+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/DisplayCGL.mm >@@ -28,8 +28,6 @@ > # include "libANGLE/renderer/gl/cgl/WindowSurfaceCGL.h" > # include "platform/PlatformMethods.h" > >-# include "libANGLE/renderer/gl/cgl/CGLFunctions.h" >- > namespace > { > >diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.cpp >index 8ed4391e030d..afdca4f2ef96 100644 >--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.cpp >+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.cpp >@@ -27,8 +27,6 @@ > # include "libANGLE/renderer/gl/TextureGL.h" > # include "libANGLE/renderer/gl/cgl/DisplayCGL.h" > >-# include "libANGLE/renderer/gl/cgl/CGLFunctions.h" >- > namespace rx > { > >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 1a1269d9d187..0fa57be43b77 100644 >--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm >+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm >@@ -23,8 +23,6 @@ > # include "libANGLE/renderer/gl/StateManagerGL.h" > # include "libANGLE/renderer/gl/cgl/DisplayCGL.h" > >-# include "libANGLE/renderer/gl/cgl/CGLFunctions.h" >- > @interface WebSwapLayer : CAOpenGLLayer { > CGLContextObj mDisplayContext; > >diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DeviceEAGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DeviceEAGL.cpp >index 64197ffefd57..a9834619240c 100644 >--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DeviceEAGL.cpp >+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DeviceEAGL.cpp >@@ -8,7 +8,7 @@ > > #import "common/platform.h" > >-#if (defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)) || (defined(ANGLE_PLATFORM_MACCATALYST) && defined(ANGLE_CPU_ARM64)) >+#if defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST) > > # include "libANGLE/renderer/gl/eagl/DeviceEAGL.h" > >@@ -56,4 +56,4 @@ void DeviceEAGL::generateExtensions(egl::DeviceExtensions *outExtensions) const > > } // namespace rx > >-#endif // (defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)) || (defined(ANGLE_PLATFORM_MACCATALYST) && defined(ANGLE_CPU_ARM64)) >+#endif // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST) >diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DeviceEAGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DeviceEAGL.h >index 93abffc0285f..57696921ef3b 100644 >--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DeviceEAGL.h >+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DeviceEAGL.h >@@ -11,7 +11,7 @@ > > #import "common/platform.h" > >-#if (defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)) || (defined(ANGLE_PLATFORM_MACCATALYST) && defined(ANGLE_CPU_ARM64)) >+#if defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST) > > #include "libANGLE/Device.h" > #include "libANGLE/renderer/DeviceImpl.h" >@@ -34,6 +34,6 @@ class DeviceEAGL : public DeviceImpl > > } // namespace rx > >-#endif // (defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)) || (defined(ANGLE_PLATFORM_MACCATALYST) && defined(ANGLE_CPU_ARM64)) >+#endif // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST) > > #endif // LIBANGLE_RENDERER_GL_EAGL_DEVICEEAGL_H_ >diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DisplayEAGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DisplayEAGL.h >index a5366e916e9c..261ba407d193 100644 >--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DisplayEAGL.h >+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DisplayEAGL.h >@@ -11,7 +11,7 @@ > > #import "common/platform.h" > >-#if (defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)) || (defined(ANGLE_PLATFORM_MACCATALYST) && defined(ANGLE_CPU_ARM64)) >+#if defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST) > > #include "libANGLE/renderer/gl/DisplayGL.h" > >@@ -97,6 +97,6 @@ class DisplayEAGL : public DisplayGL > > } // namespace rx > >-#endif // (defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)) || (defined(ANGLE_PLATFORM_MACCATALYST) && defined(ANGLE_CPU_ARM64)) >+#endif // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST) > > #endif // LIBANGLE_RENDERER_GL_EAGL_DISPLAYEAGL_H_ >diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm >index e80483637e5d..ceb2d11fc799 100644 >--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm >+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm >@@ -8,7 +8,7 @@ > > #import "common/platform.h" > >-#if (defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)) || (defined(ANGLE_PLATFORM_MACCATALYST) && defined(ANGLE_CPU_ARM64)) >+#if defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST) > > # import "libANGLE/renderer/gl/eagl/DisplayEAGL.h" > >@@ -27,6 +27,8 @@ > # import <QuartzCore/QuartzCore.h> > # import <dlfcn.h> > >+# define GLES_SILENCE_DEPRECATION >+ > namespace > { > >@@ -372,4 +374,4 @@ void DisplayEAGL::populateFeatureList(angle::FeatureList *features) > } > } > >-#endif // (defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)) || (defined(ANGLE_PLATFORM_MACCATALYST) && defined(ANGLE_CPU_ARM64)) >+#endif // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST) >diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.mm b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.mm >index b0649ad658da..d0b5c980bac9 100644 >--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.mm >+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.mm >@@ -9,7 +9,7 @@ > > #import "common/platform.h" > >-#if (defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)) || (defined(ANGLE_PLATFORM_MACCATALYST) && defined(ANGLE_CPU_ARM64)) >+#if defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST) > > # import "libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.h" > >@@ -427,4 +427,4 @@ IOSurfaceLockOptions IOSurfaceSurfaceEAGL::getIOSurfaceLockOptions() const > > } // namespace rx > >-#endif // (defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)) || (defined(ANGLE_PLATFORM_MACCATALYST) && defined(ANGLE_CPU_ARM64)) >+#endif // defined(ANGLE_PLATFORM_IOS) >diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/PbufferSurfaceEAGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/PbufferSurfaceEAGL.cpp >index cb166a4aee73..36f1c15b975d 100644 >--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/PbufferSurfaceEAGL.cpp >+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/PbufferSurfaceEAGL.cpp >@@ -9,7 +9,7 @@ > > #import "common/platform.h" > >-#if (defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)) || (defined(ANGLE_PLATFORM_MACCATALYST) && defined(ANGLE_CPU_ARM64)) >+#if defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST) > > # include "libANGLE/renderer/gl/eagl/PbufferSurfaceEAGL.h" > >@@ -144,4 +144,4 @@ FramebufferImpl *PbufferSurfaceEAGL::createDefaultFramebuffer(const gl::Context > > } // namespace rx > >-#endif // (defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)) || (defined(ANGLE_PLATFORM_MACCATALYST) && defined(ANGLE_CPU_ARM64)) >+#endif // defined(ANGLE_PLATFORM_IOS) >diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/RendererEAGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/RendererEAGL.cpp >index 4d3cfbbe7c35..a4738b2566b3 100644 >--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/RendererEAGL.cpp >+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/RendererEAGL.cpp >@@ -8,7 +8,7 @@ > > #import "common/platform.h" > >-#if (defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)) || (defined(ANGLE_PLATFORM_MACCATALYST) && defined(ANGLE_CPU_ARM64)) >+#if defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST) > > # include "libANGLE/renderer/gl/eagl/DisplayEAGL.h" > # include "libANGLE/renderer/gl/eagl/RendererEAGL.h" >@@ -31,4 +31,4 @@ WorkerContext *RendererEAGL::createWorkerContext(std::string *infoLog) > > } // namespace rx > >-#endif // (defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)) || (defined(ANGLE_PLATFORM_MACCATALYST) && defined(ANGLE_CPU_ARM64)) >+#endif // defined(ANGLE_PLATFORM_IOS) >diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.mm b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.mm >index 9c83cce7d4f9..38d253ebdeb3 100644 >--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.mm >+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.mm >@@ -8,7 +8,7 @@ > > #import "common/platform.h" > >-#if (defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)) || (defined(ANGLE_PLATFORM_MACCATALYST) && defined(ANGLE_CPU_ARM64)) >+#if defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST) > > # import "libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.h" > >@@ -22,20 +22,7 @@ > # import <OpenGLES/EAGL.h> > # import <QuartzCore/QuartzCore.h> > >-#if defined(ANGLE_PLATFORM_MACCATALYST) && defined(ANGLE_CPU_ARM64) >-//@protocol EAGLDrawable >-//- (BOOL)presentRenderbuffer:(NSUInteger)target; >-//@end >-// >-//@interface CAEAGLLayer : CALayer <EAGLDrawable> >-@interface CAEAGLLayer : CALayer >-@end >- >-@interface EAGLContext () >-- (BOOL)presentRenderbuffer:(NSUInteger)target; >-@end >- >-#endif >+// TODO(anglebug.com/4275): It's not clear why this needs to be an EAGLLayer. > > @interface WebSwapLayer : CAEAGLLayer { > EAGLContextObj mDisplayContext; >@@ -319,4 +306,4 @@ FramebufferImpl *WindowSurfaceEAGL::createDefaultFramebuffer(const gl::Context * > > } // namespace rx > >-#endif // (defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)) || (defined(ANGLE_PLATFORM_MACCATALYST) && defined(ANGLE_CPU_ARM64)) >+#endif // defined(ANGLE_PLATFORM_IOS) >diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp >index be9bc162514b..4ea106ace884 100644 >--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp >+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp >@@ -1344,7 +1344,6 @@ void GenerateCaps(const FunctionsGL *functions, > functions->hasGLESExtension("GL_EXT_compressed_ETC1_RGB8_sub_texture"); > > #if defined(ANGLE_PLATFORM_MACOS) || defined(ANGLE_PLATFORM_MACCATALYST) >- // FIXME: Runtime check not ARM64 > VendorID vendor = GetVendorID(functions); > if ((IsAMD(vendor) || IsIntel(vendor)) && *maxSupportedESVersion >= gl::Version(3, 0)) > { >diff --git a/Source/WebCore/Configurations/WebCore.xcconfig b/Source/WebCore/Configurations/WebCore.xcconfig >index 571e8eb07060..b8109e63466d 100644 >--- a/Source/WebCore/Configurations/WebCore.xcconfig >+++ b/Source/WebCore/Configurations/WebCore.xcconfig >@@ -105,6 +105,16 @@ WK_MOBILE_CORE_SERVICES_LDFLAGS_cocoatouch = -framework MobileCoreServices; > WK_MOBILE_GESTALT_LDFLAGS = $(WK_MOBILE_GESTALT_LDFLAGS_$(WK_COCOA_TOUCH)); > WK_MOBILE_GESTALT_LDFLAGS_cocoatouch = -lMobileGestalt; > >+WK_OPENGL_LDFLAGS = $(WK_OPENGL_LDFLAGS_$(WK_PLATFORM_NAME)); >+WK_OPENGL_LDFLAGS_iphoneos = -framework OpenGLES; >+WK_OPENGL_LDFLAGS_iphonesimulator = -framework OpenGLES; >+WK_OPENGL_LDFLAGS_watchos = $(WK_OPENGL_LDFLAGS_iphoneos); >+WK_OPENGL_LDFLAGS_watchsimulator = $(WK_OPENGL_LDFLAGS_iphonesimulator); >+WK_OPENGL_LDFLAGS_appletvos = $(WK_OPENGL_LDFLAGS_iphoneos); >+WK_OPENGL_LDFLAGS_appletvsimulator = $(WK_OPENGL_LDFLAGS_iphonesimulator); >+WK_OPENGL_LDFLAGS_maccatalyst = -framework OpenGL; >+WK_OPENGL_LDFLAGS_macosx = -framework OpenGL; >+ > WK_SYSTEM_CONFIGURATION_LDFLAGS = $(WK_SYSTEM_CONFIGURATION_LDFLAGS_$(WK_PLATFORM_NAME)); > WK_SYSTEM_CONFIGURATION_LDFLAGS_macosx = -framework SystemConfiguration; > >@@ -114,7 +124,7 @@ WK_URL_FORMATTING_LDFLAGS = $(WK_URL_FORMATTING_LDFLAGS_$(WK_HAVE_URL_FORMATTING > WK_URL_FORMATTING_LDFLAGS_YES = -framework URLFormatting; > > // FIXME: Reduce the number of allowable_clients <rdar://problem/31823969> >-OTHER_LDFLAGS = $(inherited) $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS) -lsqlite3 -lobjc -lANGLE -allowable_client WebCoreTestSupport -allowable_client WebKitLegacy -force_load $(BUILT_PRODUCTS_DIR)/libPAL.a -framework CFNetwork -framework CoreAudio -framework CoreGraphics -framework CoreText -framework Foundation -framework IOSurface -framework ImageIO -framework Metal $(OTHER_LDFLAGS_PLATFORM_$(WK_COCOA_TOUCH)) $(OTHER_LDFLAGS_PLATFORM_$(WK_PLATFORM_NAME)) $(WK_APPKIT_LDFLAGS) $(WK_APPSUPPORT_LDFLAGS) $(WK_AUDIO_UNIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_CORE_UI_LDFLAGS) $(WK_DATA_DETECTORS_CORE_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_IOSURFACE_ACCELERATOR_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_SYSTEM_CONFIGURATION_LDFLAGS) $(WK_CORE_IMAGE_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS); >+OTHER_LDFLAGS = $(inherited) $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS) -lsqlite3 -lobjc -lANGLE -allowable_client WebCoreTestSupport -allowable_client WebKitLegacy -force_load $(BUILT_PRODUCTS_DIR)/libPAL.a -framework CFNetwork -framework CoreAudio -framework CoreGraphics -framework CoreText -framework Foundation -framework IOSurface -framework ImageIO -framework Metal $(OTHER_LDFLAGS_PLATFORM_$(WK_COCOA_TOUCH)) $(OTHER_LDFLAGS_PLATFORM_$(WK_PLATFORM_NAME)) $(WK_APPKIT_LDFLAGS) $(WK_APPSUPPORT_LDFLAGS) $(WK_AUDIO_UNIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_CORE_UI_LDFLAGS) $(WK_DATA_DETECTORS_CORE_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_IOSURFACE_ACCELERATOR_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_OPENGL_LDFLAGS) $(WK_SYSTEM_CONFIGURATION_LDFLAGS) $(WK_CORE_IMAGE_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS); > > OTHER_LDFLAGS_PLATFORM_cocoatouch = -allowable_client WebKit -allowable_client iTunesU -allowable_client Casablanca -allowable_client Remote -allowable_client TVBooks -allowable_client DumpRenderTree -allowable_client WebKitTestRunner -allowable_client TestWebKitAPI; > OTHER_LDFLAGS_PLATFORM_macosx = -sub_library libobjc -umbrella WebKit; >diff --git a/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj b/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj >index 829980384445..605f6073ee93 100644 >--- a/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj >+++ b/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj >@@ -119,8 +119,6 @@ > 2E1342CC215AA10A007199D2 /* UIKitSoftLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E1342CA215AA10A007199D2 /* UIKitSoftLink.h */; }; > 2E1342CD215AA10A007199D2 /* UIKitSoftLink.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2E1342CB215AA10A007199D2 /* UIKitSoftLink.mm */; }; > 31308B1420A21705003FB929 /* SystemPreviewSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 31308B1320A21705003FB929 /* SystemPreviewSPI.h */; }; >- 31647FB0251759DD0010F8FB /* OpenGLSoftLinkCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 31647FAE251759DB0010F8FB /* OpenGLSoftLinkCocoa.mm */; }; >- 31647FB1251759EF0010F8FB /* OpenGLSoftLinkCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 31647FAF251759DC0010F8FB /* OpenGLSoftLinkCocoa.h */; }; > 416E995323DAE6BE00E871CB /* AudioToolboxSoftLink.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 416E995123DAE6BD00E871CB /* AudioToolboxSoftLink.cpp */; }; > 416E995423DAE6BE00E871CB /* AudioToolboxSoftLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 416E995223DAE6BE00E871CB /* AudioToolboxSoftLink.h */; }; > 41E1F344248A6A000022D5DE /* VideoToolboxSoftLink.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 416E995523DAEFF700E871CB /* VideoToolboxSoftLink.cpp */; }; >@@ -307,8 +305,6 @@ > 2E1342CA215AA10A007199D2 /* UIKitSoftLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIKitSoftLink.h; sourceTree = "<group>"; }; > 2E1342CB215AA10A007199D2 /* UIKitSoftLink.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UIKitSoftLink.mm; sourceTree = "<group>"; }; > 31308B1320A21705003FB929 /* SystemPreviewSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SystemPreviewSPI.h; sourceTree = "<group>"; }; >- 31647FAE251759DB0010F8FB /* OpenGLSoftLinkCocoa.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = OpenGLSoftLinkCocoa.mm; sourceTree = "<group>"; }; >- 31647FAF251759DC0010F8FB /* OpenGLSoftLinkCocoa.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OpenGLSoftLinkCocoa.h; sourceTree = "<group>"; }; > 37119A7820CCB5FF002C6DC9 /* WebKitTargetConditionals.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebKitTargetConditionals.xcconfig; sourceTree = "<group>"; }; > 416E995123DAE6BD00E871CB /* AudioToolboxSoftLink.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudioToolboxSoftLink.cpp; sourceTree = "<group>"; }; > 416E995223DAE6BE00E871CB /* AudioToolboxSoftLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioToolboxSoftLink.h; sourceTree = "<group>"; }; >@@ -658,8 +654,6 @@ > 1C022EFC22CFE8E0006DF01B /* Gunzip.cpp */, > CDACB35E23873E480018D7CE /* MediaToolboxSoftLink.cpp */, > CDACB35F23873E480018D7CE /* MediaToolboxSoftLink.h */, >- 31647FAF251759DC0010F8FB /* OpenGLSoftLinkCocoa.h */, >- 31647FAE251759DB0010F8FB /* OpenGLSoftLinkCocoa.mm */, > A1F63C9D21A4DBF7006FB43B /* PassKitSoftLink.h */, > A1F63C9E21A4DBF7006FB43B /* PassKitSoftLink.mm */, > 07611DB4243FA5BE00D80704 /* UsageTrackingSoftLink.h */, >@@ -830,7 +824,6 @@ > 0C2DA14C1F3BEB4900DBC317 /* NSCalendarDateSPI.h in Headers */, > A1175B4B1F6B2D7E00C4B9F0 /* NSCellSPI.h in Headers */, > 0C2DA14D1F3BEB4900DBC317 /* NSColorSPI.h in Headers */, >- 31647FB1251759EF0010F8FB /* OpenGLSoftLinkCocoa.h in Headers */, > E5D45D122106A07400D2B738 /* NSColorWellSPI.h in Headers */, > 0C77858F1F45130F00F4EBB6 /* NSEventSPI.h in Headers */, > 0C2DA14E1F3BEB4900DBC317 /* NSExtensionSPI.h in Headers */, >@@ -990,7 +983,6 @@ > 077E87B1226A460200A2AFF0 /* AVFoundationSoftLink.mm in Sources */, > 0C5FFF0F1F78D9DA009EFF1A /* ClockCM.mm in Sources */, > 0CF99CA81F738437007EE793 /* CoreMediaSoftLink.cpp in Sources */, >- 31647FB0251759DD0010F8FB /* OpenGLSoftLinkCocoa.mm in Sources */, > 1C09D0561E31C46500725F18 /* CryptoDigestCommonCrypto.cpp in Sources */, > A1175B581F6B470500C4B9F0 /* DefaultSearchProvider.cpp in Sources */, > F44291641FA52670002CC93E /* FileSizeFormatter.cpp in Sources */, >diff --git a/Source/WebCore/PAL/pal/PlatformMac.cmake b/Source/WebCore/PAL/pal/PlatformMac.cmake >index cdf01b366dd9..6591d799ea5c 100644 >--- a/Source/WebCore/PAL/pal/PlatformMac.cmake >+++ b/Source/WebCore/PAL/pal/PlatformMac.cmake >@@ -6,7 +6,6 @@ list(APPEND PAL_PUBLIC_HEADERS > cocoa/AppSSOSoftLink.h > cocoa/AVFoundationSoftLink.h > cocoa/MediaToolboxSoftLink.h >- cocoa/OpenGLSoftLinkCocoa.h > cocoa/PassKitSoftLink.h > > mac/LookupSoftLink.h >@@ -124,7 +123,6 @@ list(APPEND PAL_SOURCES > cocoa/FileSizeFormatterCocoa.mm > cocoa/Gunzip.cpp > cocoa/MediaToolboxSoftLink.cpp >- cocoa/OpenGLSoftLinkCocoa.mm > cocoa/PassKitSoftLink.mm > > crypto/commoncrypto/CryptoDigestCommonCrypto.cpp >diff --git a/Source/WebCore/PAL/pal/cocoa/OpenGLSoftLinkCocoa.h b/Source/WebCore/PAL/pal/cocoa/OpenGLSoftLinkCocoa.h >deleted file mode 100644 >index 3de9d376d7b5..000000000000 >--- a/Source/WebCore/PAL/pal/cocoa/OpenGLSoftLinkCocoa.h >+++ /dev/null >@@ -1,48 +0,0 @@ >-/* >- * Copyright (C) 2020 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. >- */ >- >-#pragma once >- >-#include <wtf/SoftLinking.h> >- >-#if PLATFORM(MAC) || PLATFORM(MACCATALYST) >- >-#include <OpenGL/OpenGL.h> >- >-SOFT_LINK_FRAMEWORK_FOR_HEADER(PAL, OpenGL) >- >-SOFT_LINK_FUNCTION_FOR_HEADER(PAL, OpenGL, CGLChoosePixelFormat, CGLError, (const CGLPixelFormatAttribute *attribs, CGLPixelFormatObj *pix, GLint *npix), (attribs, pix, npix)) >-SOFT_LINK_FUNCTION_FOR_HEADER(PAL, OpenGL, CGLCreateContext, CGLError, (CGLPixelFormatObj pix, CGLContextObj share, CGLContextObj *ctx), (pix, share, ctx)) >-SOFT_LINK_FUNCTION_FOR_HEADER(PAL, OpenGL, CGLDescribePixelFormat, CGLError, (CGLPixelFormatObj pix, GLint pix_num, CGLPixelFormatAttribute attrib, GLint *value), (pix, pix_num, attrib, value)) >-SOFT_LINK_FUNCTION_FOR_HEADER(PAL, OpenGL, CGLDescribeRenderer, CGLError, (CGLRendererInfoObj rend, GLint rend_num, CGLRendererProperty prop, GLint *value), (rend, rend_num, prop, value)) >-SOFT_LINK_FUNCTION_FOR_HEADER(PAL, OpenGL, CGLDestroyContext, CGLError, (CGLContextObj ctx), (ctx)) >-SOFT_LINK_FUNCTION_FOR_HEADER(PAL, OpenGL, CGLDestroyRendererInfo, CGLError, (CGLRendererInfoObj rend), (rend)) >-SOFT_LINK_FUNCTION_FOR_HEADER(PAL, OpenGL, CGLGetParameter, CGLError, (CGLContextObj ctx, CGLContextParameter pname, GLint *params), (ctx, pname, params)) >-SOFT_LINK_FUNCTION_FOR_HEADER(PAL, OpenGL, CGLQueryRendererInfo, CGLError, (GLuint display_mask, CGLRendererInfoObj *rend, GLint *nrend), (display_mask, rend, nrend)) >-SOFT_LINK_FUNCTION_FOR_HEADER(PAL, OpenGL, CGLReleasePixelFormat, void, (CGLPixelFormatObj pix), (pix)) >-SOFT_LINK_FUNCTION_FOR_HEADER(PAL, OpenGL, CGLSetVirtualScreen, CGLError, (CGLContextObj ctx, GLint screen), (ctx, screen)) >-SOFT_LINK_FUNCTION_FOR_HEADER(PAL, OpenGL, CGLUpdateContext, CGLError, (CGLContextObj ctx), (ctx)) >- >-#endif >diff --git a/Source/WebCore/PAL/pal/cocoa/OpenGLSoftLinkCocoa.mm b/Source/WebCore/PAL/pal/cocoa/OpenGLSoftLinkCocoa.mm >deleted file mode 100644 >index e06ee2f05f91..000000000000 >--- a/Source/WebCore/PAL/pal/cocoa/OpenGLSoftLinkCocoa.mm >+++ /dev/null >@@ -1,48 +0,0 @@ >-/* >- * Copyright (C) 2020 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 "config.h" >- >-#if PLATFORM(MAC) || PLATFORM(MACCATALYST) >- >-#include <OpenGL/OpenGL.h> >-#include <wtf/SoftLinking.h> >- >-SOFT_LINK_FRAMEWORK_FOR_SOURCE_WITH_EXPORT(PAL, OpenGL, PAL_EXPORT) >- >-SOFT_LINK_FUNCTION_FOR_SOURCE_WITH_EXPORT(PAL, OpenGL, CGLChoosePixelFormat, CGLError, (const CGLPixelFormatAttribute *attribs, CGLPixelFormatObj *pix, GLint *npix), (attribs, pix, npix), PAL_EXPORT) >-SOFT_LINK_FUNCTION_FOR_SOURCE_WITH_EXPORT(PAL, OpenGL, CGLReleasePixelFormat, void, (CGLPixelFormatObj pix), (pix), PAL_EXPORT) >- >-SOFT_LINK_FUNCTION_FOR_SOURCE(PAL, OpenGL, CGLCreateContext, CGLError, (CGLPixelFormatObj pix, CGLContextObj share, CGLContextObj *ctx), (pix, share, ctx)) >-SOFT_LINK_FUNCTION_FOR_SOURCE(PAL, OpenGL, CGLDescribePixelFormat, CGLError, (CGLPixelFormatObj pix, GLint pix_num, CGLPixelFormatAttribute attrib, GLint *value), (pix, pix_num, attrib, value)) >-SOFT_LINK_FUNCTION_FOR_SOURCE(PAL, OpenGL, CGLDescribeRenderer, CGLError, (CGLRendererInfoObj rend, GLint rend_num, CGLRendererProperty prop, GLint *value), (rend, rend_num, prop, value)) >-SOFT_LINK_FUNCTION_FOR_SOURCE(PAL, OpenGL, CGLDestroyContext, CGLError, (CGLContextObj ctx), (ctx)) >-SOFT_LINK_FUNCTION_FOR_SOURCE(PAL, OpenGL, CGLDestroyRendererInfo, CGLError, (CGLRendererInfoObj rend), (rend)) >-SOFT_LINK_FUNCTION_FOR_SOURCE(PAL, OpenGL, CGLGetParameter, CGLError, (CGLContextObj ctx, CGLContextParameter pname, GLint *params), (ctx, pname, params)) >-SOFT_LINK_FUNCTION_FOR_SOURCE(PAL, OpenGL, CGLQueryRendererInfo, CGLError, (GLuint display_mask, CGLRendererInfoObj *rend, GLint *nrend), (display_mask, rend, nrend)) >-SOFT_LINK_FUNCTION_FOR_SOURCE(PAL, OpenGL, CGLSetVirtualScreen, CGLError, (CGLContextObj ctx, GLint screen), (ctx, screen)) >-SOFT_LINK_FUNCTION_FOR_SOURCE(PAL, OpenGL, CGLUpdateContext, CGLError, (CGLContextObj ctx), (ctx)) >- >-#endif >diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj >index f6d5c60b2e44..d62d7892dc50 100644 >--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj >+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj >@@ -908,7 +908,6 @@ > 314877E61FAAB02500C05759 /* JSOffscreenCanvas.h in Headers */ = {isa = PBXBuildFile; fileRef = 314877E41FAAB02200C05759 /* JSOffscreenCanvas.h */; }; > 314BE3A11B30F6B700141982 /* CSSNamedImageValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 314BE3A01B30F6B700141982 /* CSSNamedImageValue.h */; settings = {ATTRIBUTES = (Private, ); }; }; > 314BE3A71B3103FB00141982 /* NamedImageGeneratedImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 314BE3A51B3103FB00141982 /* NamedImageGeneratedImage.h */; }; >- 31647FAB251618E20010F8FB /* OpenGLSoftLinkCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 31647FA8251616BD0010F8FB /* OpenGLSoftLinkCocoa.h */; settings = {ATTRIBUTES = (Private, ); }; }; > 316DCB201E78CA55001B5F87 /* JSRTCOfferAnswerOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 316DCB1A1E78CA55001B5F87 /* JSRTCOfferAnswerOptions.h */; }; > 316DCB221E78CA55001B5F87 /* JSRTCRtpTransceiverDirection.h in Headers */ = {isa = PBXBuildFile; fileRef = 316DCB1C1E78CA55001B5F87 /* JSRTCRtpTransceiverDirection.h */; }; > 316DCB4C1E7910A6001B5F87 /* JSRTCIceConnectionState.h in Headers */ = {isa = PBXBuildFile; fileRef = 316DCB461E7910A6001B5F87 /* JSRTCIceConnectionState.h */; }; >@@ -7183,8 +7182,6 @@ > 314BE3A41B3103FB00141982 /* NamedImageGeneratedImage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NamedImageGeneratedImage.cpp; sourceTree = "<group>"; }; > 314BE3A51B3103FB00141982 /* NamedImageGeneratedImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NamedImageGeneratedImage.h; sourceTree = "<group>"; }; > 315574CC218F66D000D88F66 /* PointerEventIOS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PointerEventIOS.cpp; sourceTree = "<group>"; }; >- 31647FA8251616BD0010F8FB /* OpenGLSoftLinkCocoa.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OpenGLSoftLinkCocoa.h; path = ../../../PAL/pal/cocoa/OpenGLSoftLinkCocoa.h; sourceTree = "<group>"; }; >- 31647FA9251616BD0010F8FB /* OpenGLSoftLinkCocoa.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = OpenGLSoftLinkCocoa.mm; path = ../../../PAL/pal/cocoa/OpenGLSoftLinkCocoa.mm; sourceTree = "<group>"; }; > 316DCB121E78BE43001B5F87 /* RTCOfferAnswerOptions.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = RTCOfferAnswerOptions.idl; sourceTree = "<group>"; }; > 316DCB171E78C330001B5F87 /* RTCRtpTransceiverDirection.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = RTCRtpTransceiverDirection.idl; sourceTree = "<group>"; }; > 316DCB191E78CA55001B5F87 /* JSRTCOfferAnswerOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSRTCOfferAnswerOptions.cpp; sourceTree = "<group>"; }; >@@ -26308,8 +26305,6 @@ > 49FFBF3E11C93EE3006A7118 /* WebGLLayer.mm */, > 318436DB21B9DAA000ED383E /* WebGPULayer.h */, > 318436DD21B9DAA000ED383E /* WebGPULayer.mm */, >- 31647FA8251616BD0010F8FB /* OpenGLSoftLinkCocoa.h */, >- 31647FA9251616BD0010F8FB /* OpenGLSoftLinkCocoa.mm */, > ); > path = cocoa; > sourceTree = "<group>"; >@@ -31086,7 +31081,6 @@ > 83040283249A7A6200A90D8D /* DistanceModelType.h in Headers */, > 84730D771248F0B300D3A9C9 /* DistantLightSource.h in Headers */, > B2F34FE60E82F81400F627CD /* DNS.h in Headers */, >- 31647FAB251618E20010F8FB /* OpenGLSoftLinkCocoa.h in Headers */, > 7EE6846F12D26E3800E73215 /* DNSResolveQueueCFNet.h in Headers */, > A8185F4009765766005826D9 /* Document.h in Headers */, > A8185F3D09765766005826D9 /* DocumentFragment.h in Headers */, >diff --git a/Source/WebCore/platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm b/Source/WebCore/platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm >index fda2a1d8d146..a626a152f8e2 100644 >--- a/Source/WebCore/platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm >+++ b/Source/WebCore/platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm >@@ -39,7 +39,6 @@ > #import "HostWindow.h" > #import "ImageBuffer.h" > #import "Logging.h" >-#import "OpenGLSoftLinkCocoa.h" > #import "WebGLLayer.h" > #import "WebGLObject.h" > #import "WebGLRenderingContextBase.h" >diff --git a/Source/WebCore/platform/mac/PlatformScreenMac.mm b/Source/WebCore/platform/mac/PlatformScreenMac.mm >index 253e3f244da9..a1b94cd1a91d 100644 >--- a/Source/WebCore/platform/mac/PlatformScreenMac.mm >+++ b/Source/WebCore/platform/mac/PlatformScreenMac.mm >@@ -31,7 +31,6 @@ > #import "FloatRect.h" > #import "FrameView.h" > #import "HostWindow.h" >-#import "OpenGLSoftLinkCocoa.h" > #import "ScreenProperties.h" > #import <ColorSync/ColorSync.h> > #import <pal/spi/cg/CoreGraphicsSPI.h> >diff --git a/Source/WebCore/platform/mac/WebGLBlocklist.mm b/Source/WebCore/platform/mac/WebGLBlocklist.mm >index 6c1d26e479a0..dbf31d8aa391 100644 >--- a/Source/WebCore/platform/mac/WebGLBlocklist.mm >+++ b/Source/WebCore/platform/mac/WebGLBlocklist.mm >@@ -29,7 +29,7 @@ > #if PLATFORM(MAC) > > #import "BlocklistUpdater.h" >-#import "OpenGLSoftLinkCocoa.h" >+#import <OpenGL/OpenGL.h> > #import <pal/spi/cf/CFUtilitiesSPI.h> > > namespace WebCore { >diff --git a/Source/WebKit/Configurations/WebKit.xcconfig b/Source/WebKit/Configurations/WebKit.xcconfig >index 5f75ecbb149c..e184cf6c9947 100644 >--- a/Source/WebKit/Configurations/WebKit.xcconfig >+++ b/Source/WebKit/Configurations/WebKit.xcconfig >@@ -88,6 +88,16 @@ WK_MOBILE_GESTALT_LDFLAGS_cocoatouch = -lMobileGestalt; > WK_LIBSANDBOX_LDFLAGS = $(WK_LIBSANDBOX_LDFLAGS_$(WK_PLATFORM_NAME)); > WK_LIBSANDBOX_LDFLAGS_macosx = -lsandbox; > >+WK_OPENGL_LDFLAGS = $(WK_OPENGL_LDFLAGS_$(WK_PLATFORM_NAME)); >+WK_OPENGL_LDFLAGS_iphoneos = -framework OpenGLES; >+WK_OPENGL_LDFLAGS_maccatalyst = -framework OpenGL; >+WK_OPENGL_LDFLAGS_iphonesimulator = -framework OpenGLES; >+WK_OPENGL_LDFLAGS_watchos = $(WK_OPENGL_LDFLAGS_iphoneos); >+WK_OPENGL_LDFLAGS_watchsimulator = $(WK_OPENGL_LDFLAGS_iphonesimulator); >+WK_OPENGL_LDFLAGS_appletvos = $(WK_OPENGL_LDFLAGS_iphoneos); >+WK_OPENGL_LDFLAGS_appletvsimulator = $(WK_OPENGL_LDFLAGS_iphonesimulator); >+WK_OPENGL_LDFLAGS_macosx = -framework OpenGL; >+ > WK_PDFKIT_LDFLAGS = $(WK_PDFKIT_LDFLAGS_$(WK_PLATFORM_NAME)); > WK_PDFKIT_LDFLAGS_iphoneos = -framework PDFKit; > WK_PDFKIT_LDFLAGS_iphoneos[sdk=iphone*11.*] = ; >@@ -123,7 +133,7 @@ WK_AUTHKIT_LDFLAGS_IOS_SINCE_13 = -framework AuthKit; > WK_AUTHKIT_LDFLAGS_macosx = $(WK_AUTHKIT_LDFLAGS$(WK_MACOS_1015)); > WK_AUTHKIT_LDFLAGS_MACOS_SINCE_1015 = -framework AuthKit; > >-FRAMEWORK_AND_LIBRARY_LDFLAGS = -lobjc -framework CFNetwork -framework CoreAudio -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework ImageIO -framework IOKit -framework IOSurface -framework WebKitLegacy -lnetwork $(WK_ACCESSIBILITY_LDFLAGS) $(WK_APPKIT_LDFLAGS) $(WK_ASSERTION_SERVICES_LDFLAGS) $(WK_RUNNINGBOARD_SERVICES_LDFLAGS) $(WK_AUTHKIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_CORE_PREDICTION_LDFLAGS) $(WK_CORE_SERVICES_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_LIBSANDBOX_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_PDFKIT_LDFLAGS) $(WK_SAFE_BROWSING_LDFLAGS) $(WK_SECURITY_INTERFACE_LDFLAGS) $(WK_UIKIT_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS) $(WK_WEBINSPECTORUI_LDFLAGS); >+FRAMEWORK_AND_LIBRARY_LDFLAGS = -lobjc -framework CFNetwork -framework CoreAudio -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework ImageIO -framework IOKit -framework IOSurface -framework WebKitLegacy -lnetwork $(WK_ACCESSIBILITY_LDFLAGS) $(WK_APPKIT_LDFLAGS) $(WK_ASSERTION_SERVICES_LDFLAGS) $(WK_RUNNINGBOARD_SERVICES_LDFLAGS) $(WK_AUTHKIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_CORE_PREDICTION_LDFLAGS) $(WK_CORE_SERVICES_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_LIBSANDBOX_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_OPENGL_LDFLAGS) $(WK_PDFKIT_LDFLAGS) $(WK_SAFE_BROWSING_LDFLAGS) $(WK_SECURITY_INTERFACE_LDFLAGS) $(WK_UIKIT_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS) $(WK_WEBINSPECTORUI_LDFLAGS); > > // Prevent C++ standard library basic_stringstream, operator new, delete and their related exception types from being exported as weak symbols. > UNEXPORTED_SYMBOL_LDFLAGS = -Wl,-unexported_symbol -Wl,__ZTISt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTISt9exception -Wl,-unexported_symbol -Wl,__ZTSSt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTSSt9exception -Wl,-unexported_symbol -Wl,__ZdlPvS_ -Wl,-unexported_symbol -Wl,__ZnwmPv -Wl,-unexported_symbol -Wl,__Znwm -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC2EOS4_ -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC1EOS4_ -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEaSEDn -Wl,-unexported_symbol -Wl,__ZNKSt3__18functionIFvN7WebCore12PolicyActionEEEclES2_ -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEE4swapERS4_ -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC1ERKS4_ -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC2ERKS4_ -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEED1Ev -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEED2Ev -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEaSERKS4_ -Wl,-unexported_symbol -Wl,__ZTVNSt3__117bad_function_callE -Wl,-unexported_symbol -Wl,__ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_13basic_istreamIcS2_EE -Wl,-unexported_symbol -Wl,__ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_14basic_iostreamIcS2_EE -Wl,-unexported_symbol -Wl,__ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE16_NS_13basic_ostreamIcS2_EE -Wl,-unexported_symbol -Wl,__ZTTNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE -Wl,-unexported_symbol -Wl,__ZTVNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEEE -Wl,-unexported_symbol -Wl,__ZTVNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE -Wl,-unexported_symbol -Wl,__ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE8_NS_13basic_ostreamIcS2_EE; >diff --git a/Source/WebKit/UIProcess/mac/HighPerformanceGPUManager.cpp b/Source/WebKit/UIProcess/mac/HighPerformanceGPUManager.cpp >index a96fc3d11379..de93967efdf9 100644 >--- a/Source/WebKit/UIProcess/mac/HighPerformanceGPUManager.cpp >+++ b/Source/WebKit/UIProcess/mac/HighPerformanceGPUManager.cpp >@@ -29,8 +29,9 @@ > #if PLATFORM(MAC) > > #include "Logging.h" >+#include <OpenGL/CGLTypes.h> >+#include <OpenGL/OpenGL.h> > #include <WebCore/GraphicsContextGLOpenGLManager.h> >-#include <WebCore/OpenGLSoftLinkCocoa.h> > > namespace WebKit { >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=409231">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 216722
:
409187
|
409199
|
409231
|
409232
|
409268
|
409520
|
409547
|
409640
|
409643