Skip to content

Commit b85445d

Browse files
authored
[angle] Fixed osx build for packages that use angle (#47306)
1 parent 5310ca8 commit b85445d

File tree

5 files changed

+14
-3
lines changed

5 files changed

+14
-3
lines changed

ports/angle/cmake-buildsystem/PlatformMac.cmake

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,15 @@ if(USE_OPENGL)
3838
list(APPEND ANGLE_SOURCES
3939
${angle_translator_glsl_base_sources}
4040
${angle_translator_glsl_sources}
41+
${angle_translator_glsl_apple_sources}
4142
)
4243
# Enable GLSL compiler output.
4344
list(APPEND ANGLE_DEFINITIONS ANGLE_ENABLE_GLSL ANGLE_ENABLE_GL_DESKTOP_BACKEND ANGLE_ENABLE_APPLE_WORKAROUNDS ANGLE_ENABLE_CGL)
45+
46+
# Still need to link with Metal as we call MTLCreateSystemDefaultDevice even if USE_METAL is not defined
47+
list(APPEND ANGLEGLESv2_LIBRARIES
48+
"-framework Metal"
49+
)
4450
endif()
4551

4652
if(USE_OPENGL OR ENABLE_WEBGL)

ports/angle/portfile.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ endif()
3232

3333
set(USE_METAL OFF)
3434
if ("metal" IN_LIST FEATURES)
35-
set(USE_METAL ON)
35+
set(USE_METAL ON)
3636
endif()
3737

3838
# chromium/7258

ports/angle/vcpkg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "angle",
33
"version-string": "chromium_7258",
4-
"port-version": 1,
4+
"port-version": 2,
55
"description": [
66
"A conformant OpenGL ES implementation for Windows, Mac and Linux.",
77
"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."

versions/a-/angle.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "6eb27c13ec4328ed3d63f058a485a4e213087bda",
5+
"version-string": "chromium_7258",
6+
"port-version": 2
7+
},
38
{
49
"git-tree": "165d665818d070431c2889ac2b8f97f006948924",
510
"version-string": "chromium_7258",

versions/baseline.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
},
139139
"angle": {
140140
"baseline": "chromium_7258",
141-
"port-version": 1
141+
"port-version": 2
142142
},
143143
"ankurvdev-embedresource": {
144144
"baseline": "0.0.12",

0 commit comments

Comments
 (0)