CMake: Add metal feature to angle port

This commit is contained in:
Andrew Kaster 2024-12-20 11:26:35 -07:00
parent 859d6d4623
commit 5000244c70
4 changed files with 15 additions and 3 deletions

View file

@ -7,7 +7,7 @@ include(WebKitCommon-minimal)
set(ANGLE_FRAMEWORK_HEADERS_DIR "${CMAKE_BINARY_DIR}/ANGLE/headers")
set(USE_ANGLE_EGL ON)
if (NOT WINDOWS_STORE)
if (NOT WINDOWS_STORE AND NOT USE_METAL)
set(USE_OPENGL ON)
endif()

View file

@ -43,7 +43,7 @@ if(USE_OPENGL)
list(APPEND ANGLE_DEFINITIONS ANGLE_ENABLE_GLSL ANGLE_ENABLE_GL_DESKTOP_BACKEND ANGLE_ENABLE_APPLE_WORKAROUNDS)
endif()
if(USE_ANGLE_EGL OR ENABLE_WEBGL)
if(USE_OPENGL OR ENABLE_WEBGL)
list(APPEND ANGLE_SOURCES
${gl_backend_sources}

View file

@ -30,6 +30,11 @@ else()
set(ANGLE_BUILDSYSTEM_PORT "Linux")
endif()
set(USE_METAL OFF)
if ("metal" IN_LIST FEATURES)
set(USE_METAL ON)
endif()
# chromium/7067
set(ANGLE_COMMIT 48103cb2f2b292cb50cc5a29546b358b2e47fd29)
set(ANGLE_VERSION 7085)
@ -169,6 +174,7 @@ vcpkg_cmake_configure(
"-DPORT=${ANGLE_BUILDSYSTEM_PORT}"
"-DANGLE_USE_D3D11_COMPOSITOR_NATIVE_WINDOW=${ANGLE_USE_D3D11_COMPOSITOR_NATIVE_WINDOW}"
"-DVCPKG_TARGET_IS_WINDOWS=${VCPKG_TARGET_IS_WINDOWS}"
"-DUSE_METAL=${USE_METAL}"
)
vcpkg_cmake_install()

View file

@ -36,5 +36,11 @@
"host": true
},
"zlib"
]
],
"features": {
"metal": {
"description": "Metal support for angle",
"supports": "ios, osx"
}
}
}