kc3-lang/angle/src/gpu_info_util/SystemInfo_win.cpp

• 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_win.cpp

• //
  // 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_win.cpp: implementation of the Windows-specific parts of SystemInfo.h
  
  #include "gpu_info_util/SystemInfo_internal.h"
  
  #include "common/debug.h"
  #include "common/string_utils.h"
  
  // Windows.h needs to be included first
  #include <windows.h>
  
  #include <d3d10.h>
  #include <dxgi.h>
  
  #include <array>
  #include <sstream>
  
  namespace angle
  {
  
  namespace
  {
  
  bool GetDevicesFromDXGI(std::vector<GPUDeviceInfo> *devices)
  {
      IDXGIFactory *factory;
      if (!SUCCEEDED(CreateDXGIFactory(__uuidof(IDXGIFactory), reinterpret_cast<void **>(&factory))))
      {
          return false;
      }
  
      UINT i                = 0;
      IDXGIAdapter *adapter = nullptr;
      while (factory->EnumAdapters(i++, &adapter) != DXGI_ERROR_NOT_FOUND)
      {
          DXGI_ADAPTER_DESC desc;
          adapter->GetDesc(&desc);
  
          LARGE_INTEGER umdVersion;
          if (adapter->CheckInterfaceSupport(__uuidof(ID3D10Device), &umdVersion) ==
              DXGI_ERROR_UNSUPPORTED)
          {
              adapter->Release();
              continue;
          }
  
          // The UMD driver version here is the same as in the registry except for the last number.
          uint64_t intVersion = umdVersion.QuadPart;
          std::ostringstream o;
  
          const uint64_t kMask = 0xFF;
          o << ((intVersion >> 48) & kMask) << ".";
          o << ((intVersion >> 32) & kMask) << ".";
          o << ((intVersion >> 16) & kMask) << ".";
          o << (intVersion & kMask);
  
          GPUDeviceInfo device;
          device.vendorId      = desc.VendorId;
          device.deviceId      = desc.DeviceId;
          device.driverVersion = o.str();
  
          devices->push_back(device);
  
          adapter->Release();
      }
  
      factory->Release();
  
      return (i > 0);
  }
  
  }  // anonymous namespace
  
  bool GetSystemInfo(SystemInfo *info)
  {
      if (!GetDevicesFromDXGI(&info->gpus))
      {
          return false;
      }
  
      if (info->gpus.size() == 0)
      {
          return false;
      }
  
      // Call GetDualGPUInfo to populate activeGPUIndex, isOptimus, and isAMDSwitchable.
      GetDualGPUInfo(info);
  
      // Override activeGPUIndex. The first index returned by EnumAdapters is the active GPU. We
      // can override the heuristic to find the active GPU
      info->activeGPUIndex = 0;
  
      // Override isOptimus. nvd3d9wrap.dll is loaded into all processes when Optimus is enabled.
      HMODULE nvd3d9wrap = GetModuleHandleW(L"nvd3d9wrap.dll");
      info->isOptimus    = nvd3d9wrap != nullptr;
  
      return true;
  }
  
  }  // namespace angle
  

Download