Commit 0412d9e1 by Jonah Ryan-Davis Committed by Commit Bot

Remove SystemInfo::primaryGPUIndex

primaryGPUIndex is being deprecated in favor of activeGPUIndex, which represends the expected index of the GPU used for graphics. Bug: angleproject:3383 Change-Id: I37f992adaf3716fc11e7f34b897c51c0148719cd Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1592055Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Jonah Ryan-Davis <jonahr@google.com>
parent b76bf1b9
...@@ -259,7 +259,6 @@ void FindActiveGPU(SystemInfo *info) ...@@ -259,7 +259,6 @@ void FindActiveGPU(SystemInfo *info)
// Assume that a combination of NVIDIA or AMD with Intel means Optimus or AMD Switchable // Assume that a combination of NVIDIA or AMD with Intel means Optimus or AMD Switchable
info->activeGPUIndex = active; info->activeGPUIndex = active;
info->primaryGPUIndex = active;
info->isOptimus = hasIntel && IsNVIDIA(info->gpus[active].vendorId); info->isOptimus = hasIntel && IsNVIDIA(info->gpus[active].vendorId);
info->isAMDSwitchable = hasIntel && IsAMD(info->gpus[active].vendorId); info->isAMDSwitchable = hasIntel && IsAMD(info->gpus[active].vendorId);
} }
......
...@@ -62,9 +62,6 @@ struct SystemInfo ...@@ -62,9 +62,6 @@ struct SystemInfo
// some platforms. On windows, this is accurate. // some platforms. On windows, this is accurate.
int activeGPUIndex = -1; int activeGPUIndex = -1;
// Deprecated, same as activeGPUIndex
int primaryGPUIndex = -1;
bool isOptimus = false; bool isOptimus = false;
bool isAMDSwitchable = false; bool isAMDSwitchable = false;
// Only true on dual-GPU Mac laptops. // Only true on dual-GPU Mac laptops.
......
...@@ -94,8 +94,6 @@ bool GetSystemInfo(SystemInfo *info) ...@@ -94,8 +94,6 @@ bool GetSystemInfo(SystemInfo *info)
// Override activeGPUIndex. The first index returned by EnumAdapters is the active GPU. We // Override activeGPUIndex. The first index returned by EnumAdapters is the active GPU. We
// can override the heuristic to find the active GPU // can override the heuristic to find the active GPU
info->activeGPUIndex = 0; info->activeGPUIndex = 0;
// Deprecated: set primaryGPUIndex to the same index.
info->primaryGPUIndex = 0;
// Override isOptimus. nvd3d9wrap.dll is loaded into all processes when Optimus is enabled. // Override isOptimus. nvd3d9wrap.dll is loaded into all processes when Optimus is enabled.
HMODULE nvd3d9wrap = GetModuleHandleW(L"nvd3d9wrap.dll"); HMODULE nvd3d9wrap = GetModuleHandleW(L"nvd3d9wrap.dll");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment