diff options
Diffstat (limited to 'www/chromium/files/patch-gpu_config_gpu__test__config.cc')
| -rw-r--r-- | www/chromium/files/patch-gpu_config_gpu__test__config.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/www/chromium/files/patch-gpu_config_gpu__test__config.cc b/www/chromium/files/patch-gpu_config_gpu__test__config.cc index b2c8de76102f..d4581bd076c2 100644 --- a/www/chromium/files/patch-gpu_config_gpu__test__config.cc +++ b/www/chromium/files/patch-gpu_config_gpu__test__config.cc @@ -1,4 +1,4 @@ ---- gpu/config/gpu_test_config.cc.orig 2017-04-19 19:06:34 UTC +--- gpu/config/gpu_test_config.cc.orig 2017-06-05 19:03:08 UTC +++ gpu/config/gpu_test_config.cc @@ -24,7 +24,7 @@ namespace { GPUTestConfig::OS GetCurrentOS() { @@ -9,7 +9,7 @@ return GPUTestConfig::kOsLinux; #elif defined(OS_WIN) int32_t major_version = 0; -@@ -255,6 +255,10 @@ bool GPUTestBotConfig::LoadCurrentConfig +@@ -255,6 +255,10 @@ bool GPUTestBotConfig::LoadCurrentConfig(const GPUInfo bool rt; if (gpu_info == NULL) { GPUInfo my_gpu_info; @@ -17,10 +17,10 @@ + rt = false; + LOG(WARNING) << "CollectGpuID not present on FreeBSD"; +#else - CollectInfoResult result = CollectGpuID( - &my_gpu_info.gpu.vendor_id, &my_gpu_info.gpu.device_id); + CollectInfoResult result = CollectBasicGraphicsInfo(&my_gpu_info); if (result != kCollectInfoSuccess) { -@@ -264,6 +268,7 @@ bool GPUTestBotConfig::LoadCurrentConfig + LOG(ERROR) << "Fail to identify GPU"; +@@ -263,6 +267,7 @@ bool GPUTestBotConfig::LoadCurrentConfig(const GPUInfo } else { rt = SetGPUInfo(my_gpu_info); } |