[webkit-changes] [WebKit/WebKit] 73d191: ANGLE needs separate files for conditionally compi...

Kimmo Kinnunen noreply at github.com
Tue Apr 18 00:04:20 PDT 2023


  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 73d191b38cf0e0109ae4c4696d57009137038fea
      https://github.com/WebKit/WebKit/commit/73d191b38cf0e0109ae4c4696d57009137038fea
  Author: Kimmo Kinnunen <kkinnunen at apple.com>
  Date:   2023-04-18 (Tue, 18 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:
  -----------
  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 Catalyst ANGLE_ENABLE_CGL
  - macOS ARM Catalyst ANGLE_ENABLE_CGL ANGLE_ENABLE_EAGL
  - iOS family ANGLE_ENABLE_EAGL

* 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/263060@main




More information about the webkit-changes mailing list