diff --git a/ports/angle/CMakeLists.txt b/ports/angle/CMakeLists.txt index 70a2e21436..184f5c9518 100644 --- a/ports/angle/CMakeLists.txt +++ b/ports/angle/CMakeLists.txt @@ -72,7 +72,21 @@ elseif(APPLE) set(ANGLE_COMMON_PLATFORM_FILTER "_linux|_win|_mac") endif() endif() + +if(APPLE) + set(ANGLE_COMMON_PLATFORM_SOURCES + "src/common/apple/*.h" + "src/common/apple/*.cpp" + "src/common/apple/*.mm" + "src/common/gl/cgl/*.h" + "src/common/gl/cgl/*.cpp" + "src/common/gl/cgl/*.mm") +else() + set(ANGLE_COMMON_PLATFORM_SOURCES ) +endif() + file(GLOB ANGLE_COMMON_SOURCES + ${ANGLE_COMMON_PLATFORM_SOURCES} "src/common/*.h" "src/common/*.inc" "src/common/*.cpp" @@ -341,6 +355,9 @@ if(WINDOWS_DESKTOP OR LINUX OR APPLE) "src/libANGLE/renderer/gl/cgl/*.mm" "src/libANGLE/renderer/gl/cgl/*.cpp" "src/libANGLE/renderer/gl/cgl/*.h" + "src/libANGLE/renderer/gl/apple/*.mm" + "src/libANGLE/renderer/gl/apple/*.cpp" + "src/libANGLE/renderer/gl/apple/*.h" "gpu_info_util/SystemInfo_macos.mm" ) elseif(LINUX) diff --git a/ports/angle/vcpkg.json b/ports/angle/vcpkg.json index e51cf09789..2c582aeb5f 100644 --- a/ports/angle/vcpkg.json +++ b/ports/angle/vcpkg.json @@ -1,7 +1,7 @@ { "name": "angle", "version-string": "chromium_4472", - "port-version": 2, + "port-version": 3, "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." diff --git a/versions/a-/angle.json b/versions/a-/angle.json index 054aab9b90..942f5ceca7 100644 --- a/versions/a-/angle.json +++ b/versions/a-/angle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c3b63c0d8bf584235c057cb40486152ebe3fa0a6", + "version-string": "chromium_4472", + "port-version": 3 + }, { "git-tree": "3c4f08e40691d643044cf9319cef04b4289d4b6f", "version-string": "chromium_4472", diff --git a/versions/baseline.json b/versions/baseline.json index a116bf09ac..8bb3656fd8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -86,7 +86,7 @@ }, "angle": { "baseline": "chromium_4472", - "port-version": 2 + "port-version": 3 }, "antlr4": { "baseline": "4.9.3",