Skip to content

A
angle
Commit b814bbb7 by Ian Elliott Committed by Commit Bot
Options

Temporarily disable calling GetSystemInfo for rules processing.

A bug on Android is causing <something> to crash if the rules-processing code calls GetSystemInfo, which in turn calls Vulkan. While this is being investigated, we will temporarily disable calling GetSystemInfo (instead, insert dummy data that won't match any actual GPU), so that the rest of the rules processing will still work. Bug: angleproject:3063 Change-Id: I9976fd57ba001099b94ebe7186739477bf0c8f79 Reviewed-on: https://chromium-review.googlesource.com/c/1405709 Commit-Queue: Ian Elliott <ianelliott@google.com> Reviewed-by: 's avatarCourtney Goeltzenleuchter <courtneygo@google.com> Reviewed-by: 's avatarCody Northrop <cnorthrop@google.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 3f0c4a56
Showing with 10 additions and 6 deletions
src/feature_support_util/feature_support_util.cpp
...@@ -845,13 +845,17 @@ ANGLE_EXPORT bool ANGLEGetSystemInfo(SystemInfoHandle *systemInfoHandle) ...@@ -845,13 +845,17 @@ ANGLE_EXPORT bool ANGLEGetSystemInfo(SystemInfoHandle *systemInfoHandle)
return false; return false;
} }
// TODO (http://anglebug.com/3036): Restore the real code
angle::SystemInfo *systemInfo = new angle::SystemInfo; angle::SystemInfo *systemInfo = new angle::SystemInfo;
if (GetSystemInfo(systemInfo)) systemInfo->gpus.resize(1);
{ GPUDeviceInfo &gpu = systemInfo->gpus[0];
*systemInfoHandle = systemInfo; gpu.vendorId = 0xFEFEFEFE;
return true; gpu.deviceId = 0xFEEEFEEE;
} gpu.driverVendor = "Foo";
return false; gpu.driverVersion = "1.2.3.4";
*systemInfoHandle = systemInfo;
return true;
} }
// This function is part of the version-2 API: // This function is part of the version-2 API:
......
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