1 changed file
angle.apple.patch | ||
Add comment 1 diff --git a/BUILD.gn b/BUILD.gn
Add comment 2 Minus index 5cb322eecf..a72313b572 100644
Add comment 2 Plus index 1dc20fa1b4..a07011fcf5 100644
Add comment 3 --- a/BUILD.gn
Add comment 4 +++ b/BUILD.gn
Add comment 5 Minus @@ -667,6 +667,7 @@ angle_static_library("angle_gpu_info_util") {
Add comment 5 Plus @@ -668,6 +668,7 @@ angle_static_library("angle_gpu_info_util") {
Add comment 6
Add comment 7 if (is_apple) {
Add comment 8 frameworks = [
Add comment 10 "IOKit.framework",
Add comment 11 "CoreFoundation.framework",
Add comment 12 "CoreGraphics.framework",
Add comment 13 Minus @@ -676,12 +677,12 @@ angle_static_library("angle_gpu_info_util") {
Add comment 13 Plus @@ -677,12 +678,12 @@ angle_static_library("angle_gpu_info_util") {
Add comment 14 } else if (angle_enable_cgl) {
Add comment 15 frameworks += [ "OpenGL.framework" ]
Add comment 16 }
Add comment 70 directory = GetExecutableDirectory() + "/Frameworks/";
Add comment 71 #elif ANGLE_PLATFORM_FUCHSIA
Add comment 72 diff --git a/src/gpu_info_util/SystemInfo_macos.mm b/src/gpu_info_util/SystemInfo_macos.mm
Add comment 73 Minus index f4d15c3302..60f59a2241 100644
Add comment 73 Plus index 553c675683..dfbfcc1e6a 100644
Add comment 74 --- a/src/gpu_info_util/SystemInfo_macos.mm
Add comment 75 +++ b/src/gpu_info_util/SystemInfo_macos.mm
Add comment 76 Minus @@ -14,10 +14,22 @@
Add comment 77 Minus
Add comment 76 Plus @@ -15,10 +15,22 @@
Add comment 77 Plus #include "common/apple_platform_utils.h"
Add comment 78 #include "common/gl/cgl/FunctionsCGL.h"
Add comment 79
Add comment 80 -#if !defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000
Add comment 99 #endif
Add comment 100
Add comment 101 namespace angle
Add comment 102 Minus @@ -268,7 +280,7 @@ uint64_t GetGpuIDFromDisplayID(uint32_t displayID)
Add comment 102 Plus @@ -235,7 +247,7 @@ uint64_t GetGpuIDFromDisplayID(uint32_t displayID)
Add comment 103 // Used with permission.
Add comment 104 uint64_t GetGpuIDFromOpenGLDisplayMask(uint32_t displayMask)
Add comment 105 {
Add comment 108 {
Add comment 109 GLint numRenderers = 0;
Add comment 110 CGLRendererInfoObj rendererInfo = nullptr;
Add comment 111 Minus @@ -315,7 +327,7 @@ VendorID GetVendorIDFromMetalDeviceRegistryID(uint64_t registryID)
Add comment 111 Plus @@ -282,7 +294,7 @@ VendorID GetVendorIDFromMetalDeviceRegistryID(uint64_t registryID)
Add comment 112 {
Add comment 113 #if defined(ANGLE_PLATFORM_MACOS)
Add comment 114 // On macOS, the following code is only supported since 10.13.
Add comment 117 #endif
Add comment 118 {
Add comment 119 // Get a matching dictionary for the IOGraphicsAccelerator2
Add comment 120 Minus @@ -363,7 +375,9 @@ VendorID GetVendorIDFromMetalDeviceRegistryID(uint64_t registryID)
Add comment 120 Plus @@ -330,7 +342,9 @@ VendorID GetVendorIDFromMetalDeviceRegistryID(uint64_t registryID)
Add comment 121
Add comment 122 return vendorId;
Add comment 123 }
Add comment 127 }
Add comment 128
Add comment 129 bool GetSystemInfo_mac(SystemInfo *info)
Add comment 130 Minus @@ -387,7 +401,7 @@ bool GetSystemInfo_mac(SystemInfo *info)
Add comment 130 Plus @@ -358,7 +372,7 @@ bool GetSystemInfo_mac(SystemInfo *info)
Add comment 131
Add comment 132 // Then override the activeGPUIndex field of info to reflect the current
Add comment 133 // GPU instead of the non-intel GPU
Add comment 137 ForceGPUSwitchIndex(info);
Add comment 138 }
Add comment 139 diff --git a/src/libGLESv2.gni b/src/libGLESv2.gni
Add comment 140 Minus index e110555c83..d4936e8d56 100644
Add comment 140 Plus index 10565a1821..e131b21bb1 100644
Add comment 141 --- a/src/libGLESv2.gni
Add comment 142 +++ b/src/libGLESv2.gni
Add comment 143 @@ -123,7 +123,7 @@ if (is_apple) {