Edit

kc3-lang/angle/src/gpu_info_util/SystemInfo_apple.mm

Branch :

  • Show log

    Commit

  • Author : James Darpinian
    Date : 2020-11-18 16:50:09
    Hash : b47f6868
    Message : Don't use CGL in Mac Catalyst on Apple Silicon This change was made downstream in WebKit: https://bugs.webkit.org/show_bug.cgi?id=218303 It turns out we must use EAGL in macCatalyst on Apple Silicon in all cases, not just in-process in iOS apps (the problem is not just about coexistence of the two GLs, but actually about our ability to load the accelerated renderer /at all/ in macCatalyst processes). I left the runtime switching in place, because there is a future in which we /can/ use CGL in non-iOS-app processes, but that future is not now. Bug: angleproject:5369 Change-Id: I9a523d038eeeeef81efa3b97771443db857e97c8 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2548316 Reviewed-by: Jonah Ryan-Davis <jonahr@google.com> Reviewed-by: Kenneth Russell <kbr@chromium.org> Commit-Queue: James Darpinian <jdarpinian@chromium.org>

  • src/gpu_info_util/SystemInfo_apple.mm
  • //
    // Copyright 2020 The ANGLE Project Authors. All rights reserved.
    // Use of this source code is governed by a BSD-style license that can be
    // found in the LICENSE file.
    //
    
    // SystemInfo_apple.cpp: implementation of the Apple-specific parts of SystemInfo.h
    
    #import "common/platform.h"
    
    #if defined(ANGLE_PLATFORM_APPLE)
    
    #    import <Foundation/Foundation.h>
    #    import <dispatch/dispatch.h>
    #    import "gpu_info_util/SystemInfo_internal.h"
    
    namespace angle
    {
    
    bool GetSystemInfo(SystemInfo *info)
    {
    #    if defined(ANGLE_PLATFORM_MACOS) || defined(ANGLE_PLATFORM_MACCATALYST)
        return GetSystemInfo_mac(info);
    #    else
        return GetSystemInfo_ios(info);
    #    endif
    }
    
    }  // namespace angle
    
    #endif  // defined(ANGLE_PLATFORM_APPLE)