Skip to content

[angle] Fixed osx build for packages that use angle #47306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vicroms merged 1 commit into from
Sep 12, 2025
Merged

[angle] Fixed osx build for packages that use angle #47306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ports/angle/cmake-buildsystem/PlatformMac.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,15 @@ if(USE_OPENGL)
list(APPEND ANGLE_SOURCES
${angle_translator_glsl_base_sources}
${angle_translator_glsl_sources}
${angle_translator_glsl_apple_sources}
)
# Enable GLSL compiler output.
list(APPEND ANGLE_DEFINITIONS ANGLE_ENABLE_GLSL ANGLE_ENABLE_GL_DESKTOP_BACKEND ANGLE_ENABLE_APPLE_WORKAROUNDS ANGLE_ENABLE_CGL)

# Still need to link with Metal as we call MTLCreateSystemDefaultDevice even if USE_METAL is not defined
list(APPEND ANGLEGLESv2_LIBRARIES
"-framework Metal"
)
endif()

if(USE_OPENGL OR ENABLE_WEBGL)
Expand Down
2 changes: 1 addition & 1 deletion ports/angle/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ endif()

set(USE_METAL OFF)
if ("metal" IN_LIST FEATURES)
set(USE_METAL ON)
set(USE_METAL ON)
endif()

# chromium/7258
Expand Down
2 changes: 1 addition & 1 deletion ports/angle/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "angle",
"version-string": "chromium_7258",
"port-version": 1,
"port-version": 2,
"description": [
"A conformant OpenGL ES implementation for Windows, Mac and Linux.",
"The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support."
Expand Down
5 changes: 5 additions & 0 deletions versions/a-/angle.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "6eb27c13ec4328ed3d63f058a485a4e213087bda",
"version-string": "chromium_7258",
"port-version": 2
},
{
"git-tree": "165d665818d070431c2889ac2b8f97f006948924",
"version-string": "chromium_7258",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
},
"angle": {
"baseline": "chromium_7258",
"port-version": 1
"port-version": 2
},
"ankurvdev-embedresource": {
"baseline": "0.0.12",
Expand Down