kc3-lang/angle/src/libANGLE/renderer/gl/apple/DisplayApple_api.cpp

• Show log

  Commit

• Hash : b47f6868
  Author :
  Date : 2020-11-18T16:50:09
  

  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>
  

Download

• src/libANGLE/renderer/gl/apple/DisplayApple_api.cpp

• //
  // 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.
  //
  // DisplayApple_api.cpp:
  //    Chooses CGL or EAGL either at compile time or runtime based on the platform.
  //
  
  #ifndef LIBANGLE_RENDERER_GL_APPLE_DISPLAYAPPLE_API_H_
  #define LIBANGLE_RENDERER_GL_APPLE_DISPLAYAPPLE_API_H_
  
  #include "libANGLE/renderer/DisplayImpl.h"
  
  #if defined(ANGLE_PLATFORM_MACOS) || defined(ANGLE_PLATFORM_MACCATALYST)
  #    include "libANGLE/renderer/gl/cgl/DisplayCGL.h"
  #    if defined(ANGLE_PLATFORM_MACCATALYST) && defined(ANGLE_CPU_ARM64)
  #        include "libANGLE/renderer/gl/eagl/DisplayEAGL.h"
  #    endif
  #elif defined(ANGLE_PLATFORM_IOS)
  #    include "libANGLE/renderer/gl/eagl/DisplayEAGL.h"
  #endif
  
  namespace rx
  {
  
  DisplayImpl *CreateDisplayCGLOrEAGL(const egl::DisplayState &state)
  {
  #if defined(ANGLE_PLATFORM_MACOS)
      return new rx::DisplayCGL(state);
  #elif defined(ANGLE_PLATFORM_MACCATALYST)
  #    if defined(ANGLE_CPU_ARM64)
      angle::SystemInfo info;
      if (!angle::GetSystemInfo(&info))
      {
          impl = nullptr;
          break;
      }
  
      if (info.needsEAGLOnMac)
      {
          return new rx::DisplayEAGL(state);
      }
      else
      {
          return new rx::DisplayCGL(state);
      }
  #    else
      return new rx::DisplayCGL(state);
  #    endif
  #elif defined(ANGLE_PLATFORM_IOS)
      return new rx::DisplayEAGL(state);
  #endif
  }
  
  }  // namespace rx
  
  #endif /* LIBANGLE_RENDERER_GL_APPLE_DISPLAYAPPLE_API_H_ */
  

Download