[webkit-changes] [WebKit/WebKit] 2cf413: Reland: ANGLE needs separate files for conditional...

[Kimmo Kinnunen]

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 2cf413ff3d31c9efa3d292492176997de1c72763
      https://github.com/WebKit/WebKit/commit/2cf413ff3d31c9efa3d292492176997de1c72763
  Author: Kimmo Kinnunen <kkinnunen at apple.com>
  Date:   2023-04-19 (Wed, 19 Apr 2023)

  Changed paths:
    M Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj
    M Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig
    A Source/ThirdParty/ANGLE/WebKit/SourcesCGL-mm.mm
    A Source/ThirdParty/ANGLE/WebKit/SourcesCGL.cpp
    A Source/ThirdParty/ANGLE/WebKit/SourcesEAGL.cpp
    A Source/ThirdParty/ANGLE/WebKit/SourcesEAGL1-mm.mm
    A Source/ThirdParty/ANGLE/WebKit/SourcesEAGL2-mm.mm
    A Source/ThirdParty/ANGLE/WebKit/SourcesGL.cpp
    A Source/ThirdParty/ANGLE/WebKit/SourcesPlatform-mm.mm
    A Source/ThirdParty/ANGLE/WebKit/SourcesPlatform.cpp
    M Source/ThirdParty/ANGLE/src/common/platform.h
    M Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp
    M Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/apple/DisplayApple_api.cpp

  Log Message:
  -----------
  Reland: ANGLE needs separate files for conditionally compiled sources for Cocoa
https://bugs.webkit.org/show_bug.cgi?id=255506
rdar://problem/108124823

Reviewed by Dean Jackson.

Add WebKit specific files that include conditional compiled code files
with the conditions. The per file conditions will be removed from the
individual files in upstream.

Make the build system define ANGLE_ENABLE_EAGL and the new, to be used
define ANGLE_ENABLE_CGL.

The defines are defined as follows:
  - All ANGLE_ENABLE_METAL
  - macOS ANGLE_ENABLE_CGL
  - macOS x86_64 MacCatalyst ANGLE_ENABLE_CGL
  - macOS ARM MacCatalyst ANGLE_ENABLE_CGL ANGLE_ENABLE_EAGL
    ANGLE_CPU_ARM64
  - iOS family ANGLE_ENABLE_EAGL

Reland:
  Add removed define ANGLE_CPU_ARM64 to the xcconfig when compiling on
  ARM MacCatalyst.

* Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj:
* Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig:
* Source/ThirdParty/ANGLE/WebKit/SourcesCGL-mm.mm: Added.
* Source/ThirdParty/ANGLE/WebKit/SourcesCGL.cpp: Added.
* Source/ThirdParty/ANGLE/WebKit/SourcesEAGL.cpp: Added.
* Source/ThirdParty/ANGLE/WebKit/SourcesEAGL1-mm.mm: Added.
* Source/ThirdParty/ANGLE/WebKit/SourcesEAGL2-mm.mm: Added.
* Source/ThirdParty/ANGLE/WebKit/SourcesGL.cpp: Added.
* Source/ThirdParty/ANGLE/WebKit/SourcesPlatform-mm.mm: Added.
* Source/ThirdParty/ANGLE/WebKit/SourcesPlatform.cpp: Added.
* Source/ThirdParty/ANGLE/src/common/platform.h:
* Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp:
* Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/apple/DisplayApple_api.cpp:

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