[webkit-changes] [WebKit/WebKit] 0e6e24: [ANGLE] Disable CGL and EAGL on Apple Mac Catalyst

[Elliott Williams]

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 0e6e2460a87d6452655c9d9d6f0bcafa40cc48cc
      https://github.com/WebKit/WebKit/commit/0e6e2460a87d6452655c9d9d6f0bcafa40cc48cc
  Author: Elliott Williams <emw at apple.com>
  Date:   2024-05-29 (Wed, 29 May 2024)

  Changed paths:
    M Source/ThirdParty/ANGLE/Configurations/BaseTarget.xcconfig
    M Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_macos.mm
    M Source/WebCore/PAL/pal/cocoa/OpenGLSoftLinkCocoa.h
    M Source/WebCore/PAL/pal/cocoa/OpenGLSoftLinkCocoa.mm
    M Source/WebCore/platform/graphics/cocoa/GraphicsContextGLCocoa.mm
    M Source/WebCore/platform/graphics/cv/GraphicsContextGLCVCocoa.cpp
    M Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig

  Log Message:
  -----------
  [ANGLE] Disable CGL and EAGL on Apple Mac Catalyst
https://bugs.webkit.org/show_bug.cgi?id=274558
rdar://problem/128575633

Reviewed by Kimmo Kinnunen and Mike Wyrzykowski.

iOS apps running on an Apple silicon Mac could request the EAGL backend
on older hardware, but now they all use Metal. Stop compiling with EAGL
support. This works towards supporting the building the Mac Catalyst
port using the public SDK, which does not have EAGL.

Also remove CGL (OpenGL) support, as it does not make sense that ASi
would use only Metal but X86_64 would support also CGL.

Currently supported macOS platforms all default to ANGLE/Metal.

* Source/ThirdParty/ANGLE/Configurations/BaseTarget.xcconfig:
* Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_macos.mm:
(angle::GetGpuIDFromDisplayID):
* Source/WebCore/PAL/pal/cocoa/OpenGLSoftLinkCocoa.h:
* Source/WebCore/PAL/pal/cocoa/OpenGLSoftLinkCocoa.mm:
* Source/WebCore/platform/graphics/cocoa/GraphicsContextGLCocoa.mm:
(WebCore::platformSupportsMetal):
(WebCore::initializeEGLDisplay):
(WebCore::GraphicsContextGLCocoa::platformInitializeContext):
(WebCore::GraphicsContextGLCocoa::platformInitializeExtensions):
(WebCore::needsEAGLOnMac): Deleted.
* Source/WebCore/platform/graphics/cv/GraphicsContextGLCVCocoa.cpp:
(WebCore::GraphicsContextGLCVCocoa::GraphicsContextGLCVCocoa):
* Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig:

Canonical link: https://commits.webkit.org/279488@main



To unsubscribe from these emails, change your notification settings at https://github.com/WebKit/WebKit/settings/notifications