Hash :
a9f2e87e
Author :
Date :
2021-11-12T15:02:50
Revert "Vulkan: Allow SystemInfo to pick ICD." This reverts commit b5adbe272e4829d77105e49607bf8ddafd385f17. Reason for revert: Fails GN check on Android/iOS in Chrome: https://chromium-review.googlesource.com/c/chromium/src/+/3276779/ Original change's description: > Vulkan: Allow SystemInfo to pick ICD. > > This will be used in conjunction with SwiftShader. > > Bug: angleproject:6496 > Change-Id: I894aa4cf3b9473738b549de9941eb82e09234121 > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3276515 > Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> > Commit-Queue: Jamie Madill <jmadill@chromium.org> TBR=syoussefi@chromium.org,jmadill@chromium.org,angle-scoped@luci-project-accounts.iam.gserviceaccount.com Change-Id: I198802d6bc93993d3544ed4627e131cb7b93f381 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: angleproject:6496 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3276045 Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160
//
// 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.
//
// Simple unit test suite that prints out system info as JSON.
//
// Example output for a Windows/NV machine:
//
// {
// "activeGPUIndex": 0,
// "isOptimus": false,
// "isMacSwitchable": false,
// "machineManufacturer": "",
// "machineModelVersion": "",
// "gpus": [
// {
// "vendorId": 4318,
// "deviceId": 7040,
// "driverVendor": "NVIDIA Corporation",
// "driverVersion": "452.6.0.0",
// "driverDate": "",
// "detailedDriverVersion": {
// "major": 452,
// "minor": 6,
// "subMinor": 0,
// "patch": 0
// }
// }
// ]
// }
#include "gpu_info_util/SystemInfo.h"
#include <cstdlib>
#include <gtest/gtest.h>
#include <rapidjson/document.h>
#include <rapidjson/prettywriter.h>
#include <rapidjson/stringbuffer.h>
namespace js = rapidjson;
bool gFailedToFindGPU;
int main(int argc, char **argv)
{
angle::SystemInfo info;
bool useVulkan = false;
bool listTests = false;
for (int arg = 1; arg < argc; ++arg)
{
if (strcmp(argv[arg], "--vulkan") == 0)
{
useVulkan = true;
}
else if (strcmp(argv[arg], "--gtest_list_tests") == 0)
{
listTests = true;
}
}
if (listTests)
{
testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS();
}
if (useVulkan)
{
#if defined(ANGLE_ENABLE_VULKAN)
angle::GetSystemInfoVulkan(&info);
#else
printf("Vulkan not supported.\n");
return EXIT_FAILURE;
#endif // defined(ANGLE_ENABLE_VULKAN)
}
else
{
angle::GetSystemInfo(&info);
}
if (info.gpus.empty())
{
gFailedToFindGPU = true;
}
js::Document doc;
doc.SetObject();
js::Document::AllocatorType &allocator = doc.GetAllocator();
doc.AddMember("activeGPUIndex", info.activeGPUIndex, allocator);
doc.AddMember("isOptimus", info.isOptimus, allocator);
doc.AddMember("isMacSwitchable", info.isMacSwitchable, allocator);
js::Value machineManufacturer;
machineManufacturer.SetString(info.machineManufacturer.c_str(), allocator);
doc.AddMember("machineManufacturer", machineManufacturer, allocator);
js::Value machineModelVersion;
machineModelVersion.SetString(info.machineModelVersion.c_str(), allocator);
doc.AddMember("machineModelVersion", machineModelVersion, allocator);
js::Value gpus;
gpus.SetArray();
for (const angle::GPUDeviceInfo &gpu : info.gpus)
{
js::Value obj;
obj.SetObject();
obj.AddMember("vendorId", gpu.vendorId, allocator);
obj.AddMember("deviceId", gpu.deviceId, allocator);
js::Value driverVendor;
driverVendor.SetString(gpu.driverVendor.c_str(), allocator);
obj.AddMember("driverVendor", driverVendor, allocator);
js::Value driverVersion;
driverVersion.SetString(gpu.driverVersion.c_str(), allocator);
obj.AddMember("driverVersion", driverVersion, allocator);
js::Value driverDate;
driverDate.SetString(gpu.driverDate.c_str(), allocator);
obj.AddMember("driverDate", driverDate, allocator);
js::Value versionInfo;
versionInfo.SetObject();
versionInfo.AddMember("major", gpu.detailedDriverVersion.major, allocator);
versionInfo.AddMember("minor", gpu.detailedDriverVersion.minor, allocator);
versionInfo.AddMember("subMinor", gpu.detailedDriverVersion.subMinor, allocator);
versionInfo.AddMember("patch", gpu.detailedDriverVersion.patch, allocator);
obj.AddMember("detailedDriverVersion", versionInfo, allocator);
gpus.PushBack(obj, allocator);
}
doc.AddMember("gpus", gpus, allocator);
js::StringBuffer buffer;
js::PrettyWriter<js::StringBuffer> writer(buffer);
doc.Accept(writer);
const char *output = buffer.GetString();
printf("%s\n", output);
testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS();
}
TEST(ANGLE, SystemInfo)
{
if (gFailedToFindGPU)
{
FAIL() << "Failed to find GPU info.";
}
}