kc3-lang/angle/src/gpu_info_util/SystemInfo_internal.h

• Show log

  Commit

• Hash : 5ec04880
  Author :
  Date : 2019-08-22T21:12:08
  

  Reland "Make Mac SystemInfo reflect the currently active GPU on dual GPU machines"
  
  This reverts commit 58940f67acd5b89f1c338b134a596864595fcdca.
  
  Reason for revert: pixel test failures have been triaged in Gold. Relanding.
  
  Original change's description:
  > Revert "Make Mac SystemInfo reflect the currently active GPU on dual GPU machines"
  > 
  > This reverts commit 720a8bab0eca86e5b9b8c07c200a217fb2c65755.
  > 
  > Reason for revert: pixel test failures per http://crbug.com/984780#c13
  > 
  > Original change's description:
  > > Make Mac SystemInfo reflect the currently active GPU on dual GPU machines
  > > 
  > > Currently, the GetSystemInfo() function (in gpu_info_util/SystemInfo_mac.mm)
  > > on dual GPU Macs always updates the active GPU field of the SystemInfo
  > > instance to the first non-Intel GPU it finds. This change overrides the
  > > activeGPUIndex field of the SystemInfo instance to reflect the current GPU
  > > instead of the non-intel GPU.
  > > 
  > > Bug: 985486, 984780, angleproject:3701
  > > Change-Id: Ia93f38f4a2f7728c05e99c83a940722bd3808766
  > > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1752334
  > > Commit-Queue: Kenneth Russell <kbr@chromium.org>
  > > Reviewed-by: Zhenyao Mo <zmo@chromium.org>
  > > Reviewed-by: Kenneth Russell <kbr@chromium.org>
  > 
  > TBR=zmo@chromium.org,geofflang@chromium.org,kbr@chromium.org,dakshidnani@google.com
  > 
  > Change-Id: Iacf4b8433ac1aa4d30c51f08ddfc6489af440cc4
  > No-Presubmit: true
  > No-Tree-Checks: true
  > No-Try: true
  > Bug: 985486, 984780, angleproject:3701
  > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1757373
  > Reviewed-by: Jonah Ryan-Davis <jonahr@google.com>
  > Commit-Queue: Jonah Ryan-Davis <jonahr@google.com>
  
  Bug: 985486, 984780, angleproject:3701
  Change-Id: I8f2f26f68329a2826a92742c46471b8c092b36ed
  Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1765963
  Reviewed-by: Kenneth Russell <kbr@chromium.org>
  Commit-Queue: Kenneth Russell <kbr@chromium.org>
  

Download

• src/gpu_info_util/SystemInfo_internal.h

• //
  // Copyright 2013 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_internal.h: Functions used by the SystemInfo_* files and unittests
  
  #ifndef GPU_INFO_UTIL_SYSTEM_INFO_INTERNAL_H_
  #define GPU_INFO_UTIL_SYSTEM_INFO_INTERNAL_H_
  
  #include "gpu_info_util/SystemInfo.h"
  
  namespace angle
  {
  
  // Defined in SystemInfo_libpci when GPU_INFO_USE_LIBPCI is defined.
  bool GetPCIDevicesWithLibPCI(std::vector<GPUDeviceInfo> *devices);
  // Defined in SystemInfo_x11 when GPU_INFO_USE_X11 is defined.
  bool GetNvidiaDriverVersionWithXNVCtrl(std::string *version);
  
  // Target specific helper functions that can be compiled on all targets
  // Live in SystemInfo.cpp
  bool ParseAMDBrahmaDriverVersion(const std::string &content, std::string *version);
  bool ParseAMDCatalystDriverVersion(const std::string &content, std::string *version);
  bool ParseMacMachineModel(const std::string &identifier,
                            std::string *type,
                            int32_t *major,
                            int32_t *minor);
  bool CMDeviceIDToDeviceAndVendorID(const std::string &id, uint32_t *vendorId, uint32_t *deviceId);
  
  }  // namespace angle
  
  #endif  // GPU_INFO_UTIL_SYSTEM_INFO_INTERNAL_H_
  

Download