diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-24 11:40:17 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-24 12:42:11 +0000 |
| commit | 5d87695f37678f96492b258bbab36486c59866b4 (patch) | |
| tree | be9783bbaf04fb930c4d74ca9c00b5e7954c8bc6 /chromium/gpu/config | |
| parent | 6c11fb357ec39bf087b8b632e2b1e375aef1b38b (diff) | |
| download | qtwebengine-chromium-5d87695f37678f96492b258bbab36486c59866b4.tar.gz | |
BASELINE: Update Chromium to 75.0.3770.56
Change-Id: I86d2007fd27a45d5797eee06f4c9369b8b50ac4f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/gpu/config')
24 files changed, 1390 insertions, 190 deletions
diff --git a/chromium/gpu/config/BUILD.gn b/chromium/gpu/config/BUILD.gn index 70df68296d4..505ca73a089 100644 --- a/chromium/gpu/config/BUILD.gn +++ b/chromium/gpu/config/BUILD.gn @@ -161,6 +161,11 @@ jumbo_source_set("config_sources") { "//ui/gl/init", ] + # GpuPreferences is using its own mojo bindings which creates a + # cycle between this target and gpu_preferences_interface. + allow_circular_includes_from = + [ "//gpu/ipc/common:gpu_preferences_interface" ] + # Prefer mesa GL headers to system headers, which cause problems on Win. include_dirs = [ "//third_party/mesa_headers" ] diff --git a/chromium/gpu/config/gpu_control_list.cc b/chromium/gpu/config/gpu_control_list.cc index 4e28d955d44..3a7166c11ca 100644 --- a/chromium/gpu/config/gpu_control_list.cc +++ b/chromium/gpu/config/gpu_control_list.cc @@ -300,7 +300,8 @@ bool GpuControlList::More::Contains(const GPUInfo& gpu_info) const { return false; } } - if (!direct_rendering && gpu_info.direct_rendering) { + if (direct_rendering_version.IsSpecified() && + !direct_rendering_version.Contains(gpu_info.direct_rendering_version)) { return false; } if (in_process_gpu && !gpu_info.in_process_gpu) { diff --git a/chromium/gpu/config/gpu_control_list.h b/chromium/gpu/config/gpu_control_list.h index e84b9625f44..4563cac5d37 100644 --- a/chromium/gpu/config/gpu_control_list.h +++ b/chromium/gpu/config/gpu_control_list.h @@ -153,7 +153,7 @@ class GPU_EXPORT GpuControlList { Version pixel_shader_version; bool in_process_gpu; uint32_t gl_reset_notification_strategy; - bool direct_rendering; + Version direct_rendering_version; Version gpu_count; SupportedOrNot hardware_overlay; diff --git a/chromium/gpu/config/gpu_control_list_entry_unittest.cc b/chromium/gpu/config/gpu_control_list_entry_unittest.cc index 6214f409816..e35e9c5e3c7 100644 --- a/chromium/gpu/config/gpu_control_list_entry_unittest.cc +++ b/chromium/gpu/config/gpu_control_list_entry_unittest.cc @@ -661,9 +661,17 @@ TEST_F(GpuControlListEntryTest, NVidiaNumberingScheme) { TEST_F(GpuControlListEntryTest, DirectRendering) { const Entry& entry = GetEntry(kGpuControlListEntryTest_DirectRendering); GPUInfo gpu_info; - gpu_info.direct_rendering = true; + // No info does not match. + gpu_info.direct_rendering_version = ""; EXPECT_FALSE(entry.Contains(kOsLinux, "7.0", gpu_info)); - gpu_info.direct_rendering = false; + + // Indirect rendering does not match. + gpu_info.direct_rendering_version = "1"; + EXPECT_FALSE(entry.Contains(kOsLinux, "7.0", gpu_info)); + + gpu_info.direct_rendering_version = "2"; + EXPECT_TRUE(entry.Contains(kOsLinux, "7.0", gpu_info)); + gpu_info.direct_rendering_version = "2.3"; EXPECT_TRUE(entry.Contains(kOsLinux, "7.0", gpu_info)); } diff --git a/chromium/gpu/config/gpu_control_list_testing.json b/chromium/gpu/config/gpu_control_list_testing.json index 3c4cd7764dd..ca5a29e50cc 100644 --- a/chromium/gpu/config/gpu_control_list_testing.json +++ b/chromium/gpu/config/gpu_control_list_testing.json @@ -698,7 +698,10 @@ "os": { "type": "linux" }, - "direct_rendering": false, + "direct_rendering_version": { + "op" : ">=", + "value": "2" + }, "features": [ "test_feature_1" ] diff --git a/chromium/gpu/config/gpu_control_list_testing_arrays_and_structs_autogen.h b/chromium/gpu/config/gpu_control_list_testing_arrays_and_structs_autogen.h index f543d980110..34dfde9be3e 100644 --- a/chromium/gpu/config/gpu_control_list_testing_arrays_and_structs_autogen.h +++ b/chromium/gpu/config/gpu_control_list_testing_arrays_and_structs_autogen.h @@ -40,22 +40,134 @@ const GpuControlList::DriverInfo kDriverInfoForGpuControlTestingEntry1 = { nullptr}, // driver_date }; +const GpuControlList::More kMoreForEntry1_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry2[1] = { TEST_FEATURE_0, }; +const GpuControlList::More kMoreForEntry2_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry3[1] = { TEST_FEATURE_0, }; +const GpuControlList::More kMoreForEntry3_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry4[1] = { TEST_FEATURE_0, }; +const GpuControlList::More kMoreForEntry4_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + +const GpuControlList::More kMoreForEntry4_1440601243Exception0 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry5[1] = { TEST_FEATURE_0, }; +const GpuControlList::More kMoreForEntry5_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + +const GpuControlList::More kMoreForEntry5_1440601243Exception0 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry6[1] = { TEST_FEATURE_0, }; @@ -68,6 +180,22 @@ const GpuControlList::DriverInfo kDriverInfoForGpuControlTestingEntry6 = { nullptr}, // driver_date }; +const GpuControlList::More kMoreForEntry6_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry7[1] = { TEST_FEATURE_0, }; @@ -77,15 +205,47 @@ const uint32_t kDeviceIDsForGpuControlTestingEntry7[2] = { 0x0640, }; +const GpuControlList::More kMoreForEntry7_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry8[1] = { TEST_FEATURE_0, }; +const GpuControlList::More kMoreForEntry8_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry9[1] = { TEST_FEATURE_0, }; -const GpuControlList::More kMoreForEntry9 = { +const GpuControlList::More kMoreForEntry9_1440601243 = { GpuControlList::kGLTypeGLES, // gl_type {GpuControlList::kEQ, GpuControlList::kVersionStyleNumerical, "3.0", nullptr}, // gl_version @@ -93,7 +253,8 @@ const GpuControlList::More kMoreForEntry9 = { nullptr}, // pixel_shader_version false, // in_process_gpu 0, // gl_reset_notification_strategy - true, // direct_rendering + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, nullptr}, // gpu_count GpuControlList::kDontCare, // hardware_overlay @@ -104,7 +265,7 @@ const int kFeatureListForGpuControlTestingEntry10[1] = { TEST_FEATURE_0, }; -const GpuControlList::More kMoreForEntry10 = { +const GpuControlList::More kMoreForEntry10_1440601243 = { GpuControlList::kGLTypeANGLE, // gl_type {GpuControlList::kGT, GpuControlList::kVersionStyleNumerical, "2.0", nullptr}, // gl_version @@ -112,7 +273,8 @@ const GpuControlList::More kMoreForEntry10 = { nullptr}, // pixel_shader_version false, // in_process_gpu 0, // gl_reset_notification_strategy - true, // direct_rendering + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, nullptr}, // gpu_count GpuControlList::kDontCare, // hardware_overlay @@ -123,7 +285,7 @@ const int kFeatureListForGpuControlTestingEntry11[1] = { TEST_FEATURE_0, }; -const GpuControlList::More kMoreForEntry11 = { +const GpuControlList::More kMoreForEntry11_1440601243 = { GpuControlList::kGLTypeGL, // gl_type {GpuControlList::kLT, GpuControlList::kVersionStyleNumerical, "4.0", nullptr}, // gl_version @@ -131,7 +293,8 @@ const GpuControlList::More kMoreForEntry11 = { nullptr}, // pixel_shader_version false, // in_process_gpu 0, // gl_reset_notification_strategy - true, // direct_rendering + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, nullptr}, // gpu_count GpuControlList::kDontCare, // hardware_overlay @@ -149,6 +312,22 @@ const GpuControlList::GLStrings kGLStringsForGpuControlTestingEntry12 = { nullptr, }; +const GpuControlList::More kMoreForEntry12_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry13[1] = { TEST_FEATURE_0, }; @@ -160,6 +339,22 @@ const GpuControlList::GLStrings kGLStringsForGpuControlTestingEntry13 = { nullptr, }; +const GpuControlList::More kMoreForEntry13_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry14[1] = { TEST_FEATURE_0, }; @@ -171,6 +366,22 @@ const GpuControlList::GLStrings kGLStringsForGpuControlTestingEntry14 = { nullptr, }; +const GpuControlList::More kMoreForEntry14_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry15[1] = { TEST_FEATURE_0, }; @@ -182,6 +393,22 @@ const GpuControlList::GLStrings kGLStringsForGpuControlTestingEntry15 = { nullptr, }; +const GpuControlList::More kMoreForEntry15_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry16[1] = { TEST_FEATURE_0, }; @@ -193,14 +420,62 @@ const GpuControlList::GLStrings kGLStringsForGpuControlTestingEntry16 = { nullptr, }; +const GpuControlList::More kMoreForEntry16_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry17[1] = { TEST_FEATURE_0, }; +const GpuControlList::More kMoreForEntry17_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry18[1] = { TEST_FEATURE_0, }; +const GpuControlList::More kMoreForEntry18_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry19[1] = { TEST_FEATURE_0, }; @@ -213,6 +488,22 @@ const GpuControlList::DriverInfo kDriverInfoForGpuControlTestingEntry19 = { nullptr}, // driver_date }; +const GpuControlList::More kMoreForEntry19_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry20[1] = { TEST_FEATURE_0, }; @@ -225,6 +516,22 @@ const GpuControlList::DriverInfo kDriverInfoForGpuControlTestingEntry20 = { nullptr}, // driver_date }; +const GpuControlList::More kMoreForEntry20_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry21[1] = { TEST_FEATURE_1, }; @@ -237,10 +544,42 @@ const GpuControlList::DriverInfo kDriverInfoForGpuControlTestingEntry21 = { nullptr}, // driver_date }; +const GpuControlList::More kMoreForEntry21_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry22[1] = { TEST_FEATURE_1, }; +const GpuControlList::More kMoreForEntry22_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const GpuControlList::GLStrings kGLStringsForGpuControlTestingEntry22Exception0 = { nullptr, @@ -249,11 +588,27 @@ const GpuControlList::GLStrings nullptr, }; +const GpuControlList::More kMoreForEntry22_1440601243Exception0 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry23[1] = { TEST_FEATURE_1, }; -const GpuControlList::More kMoreForEntry23 = { +const GpuControlList::More kMoreForEntry23_1440601243 = { GpuControlList::kGLTypeGL, // gl_type {GpuControlList::kLT, GpuControlList::kVersionStyleNumerical, "3.5", nullptr}, // gl_version @@ -261,7 +616,8 @@ const GpuControlList::More kMoreForEntry23 = { nullptr}, // pixel_shader_version false, // in_process_gpu 0, // gl_reset_notification_strategy - true, // direct_rendering + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, nullptr}, // gpu_count GpuControlList::kDontCare, // hardware_overlay @@ -274,11 +630,43 @@ const int kFeatureListForGpuControlTestingEntry24[3] = { TEST_FEATURE_2, }; +const GpuControlList::More kMoreForEntry24_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry25[2] = { TEST_FEATURE_1, TEST_FEATURE_2, }; +const GpuControlList::More kMoreForEntry25_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry26[1] = { TEST_FEATURE_0, }; @@ -287,6 +675,22 @@ const uint32_t kDeviceIDsForGpuControlTestingEntry26[1] = { 0x0640, }; +const GpuControlList::More kMoreForEntry26_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry27[1] = { TEST_FEATURE_0, }; @@ -305,10 +709,42 @@ const GpuControlList::MachineModelInfo kMachineModelInfoForEntry27 = { nullptr}, // machine model version }; +const GpuControlList::More kMoreForEntry27_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry28[1] = { TEST_FEATURE_0, }; +const GpuControlList::More kMoreForEntry28_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const char* const kMachineModelNameForEntry28Exception0[1] = { "Nexus.*", }; @@ -321,6 +757,22 @@ const GpuControlList::MachineModelInfo kMachineModelInfoForEntry28Exception0 = { nullptr}, // machine model version }; +const GpuControlList::More kMoreForEntry28_1440601243Exception0 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry29[1] = { TEST_FEATURE_0, }; @@ -336,6 +788,22 @@ const GpuControlList::MachineModelInfo kMachineModelInfoForEntry29 = { nullptr}, // machine model version }; +const GpuControlList::More kMoreForEntry29_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry30[1] = { TEST_FEATURE_0, }; @@ -351,6 +819,22 @@ const GpuControlList::MachineModelInfo kMachineModelInfoForEntry30 = { nullptr}, // machine model version }; +const GpuControlList::More kMoreForEntry30_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const GpuControlList::MachineModelInfo kMachineModelInfoForEntry30Exception0 = { 0, // machine model name size nullptr, // machine model names @@ -358,6 +842,22 @@ const GpuControlList::MachineModelInfo kMachineModelInfoForEntry30Exception0 = { nullptr}, // machine model version }; +const GpuControlList::More kMoreForEntry30_1440601243Exception0 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry31[1] = { TEST_FEATURE_0, }; @@ -366,6 +866,22 @@ const uint32_t kDeviceIDsForGpuControlTestingEntry31[1] = { 0x0166, }; +const GpuControlList::More kMoreForEntry31_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry32[1] = { TEST_FEATURE_0, }; @@ -374,6 +890,22 @@ const uint32_t kDeviceIDsForGpuControlTestingEntry32[1] = { 0x0640, }; +const GpuControlList::More kMoreForEntry32_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry33[1] = { TEST_FEATURE_0, }; @@ -382,6 +914,22 @@ const uint32_t kDeviceIDsForGpuControlTestingEntry33[1] = { 0x0166, }; +const GpuControlList::More kMoreForEntry33_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry34[1] = { TEST_FEATURE_0, }; @@ -390,6 +938,22 @@ const uint32_t kDeviceIDsForGpuControlTestingEntry34[1] = { 0x0166, }; +const GpuControlList::More kMoreForEntry34_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry35[1] = { TEST_FEATURE_0, }; @@ -398,6 +962,22 @@ const uint32_t kDeviceIDsForGpuControlTestingEntry35[1] = { 0x0166, }; +const GpuControlList::More kMoreForEntry35_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry36[1] = { TEST_FEATURE_0, }; @@ -407,10 +987,42 @@ const uint32_t kDeviceIDsForGpuControlTestingEntry36[2] = { 0x0168, }; +const GpuControlList::More kMoreForEntry36_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry37[1] = { TEST_FEATURE_0, }; +const GpuControlList::More kMoreForEntry37_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry38[1] = { TEST_FEATURE_0, }; @@ -419,15 +1031,47 @@ const uint32_t kDeviceIDsForGpuControlTestingEntry38[1] = { 0x0640, }; +const GpuControlList::More kMoreForEntry38_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry39[1] = { TEST_FEATURE_0, }; +const GpuControlList::More kMoreForEntry39_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry40[1] = { TEST_FEATURE_0, }; -const GpuControlList::More kMoreForEntry40 = { +const GpuControlList::More kMoreForEntry40_1440601243 = { GpuControlList::kGLTypeNone, // gl_type {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, nullptr}, // gl_version @@ -435,7 +1079,8 @@ const GpuControlList::More kMoreForEntry40 = { nullptr}, // pixel_shader_version false, // in_process_gpu 0, // gl_reset_notification_strategy - true, // direct_rendering + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, nullptr}, // gpu_count GpuControlList::kDontCare, // hardware_overlay @@ -446,22 +1091,102 @@ const int kFeatureListForGpuControlTestingEntry41[1] = { TEST_FEATURE_0, }; +const GpuControlList::More kMoreForEntry41_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry42[1] = { TEST_FEATURE_0, }; +const GpuControlList::More kMoreForEntry42_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry43[1] = { TEST_FEATURE_0, }; +const GpuControlList::More kMoreForEntry43_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry44[1] = { TEST_FEATURE_0, }; +const GpuControlList::More kMoreForEntry44_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry45[1] = { TEST_FEATURE_0, }; +const GpuControlList::More kMoreForEntry45_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const uint32_t kDeviceIDsForGpuControlTestingEntry45Exception0[1] = { 0x2a06, }; @@ -475,6 +1200,22 @@ const GpuControlList::DriverInfo nullptr, nullptr}, // driver_date }; +const GpuControlList::More kMoreForEntry45_1440601243Exception0 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const uint32_t kDeviceIDsForGpuControlTestingEntry45Exception1[1] = { 0x2a02, }; @@ -488,19 +1229,67 @@ const GpuControlList::DriverInfo nullptr, nullptr}, // driver_date }; +const GpuControlList::More kMoreForEntry45_1440601243Exception1 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry46[1] = { TEST_FEATURE_0, }; +const GpuControlList::More kMoreForEntry46_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry47[1] = { TEST_FEATURE_0, }; +const GpuControlList::More kMoreForEntry47_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry48[1] = { TEST_FEATURE_0, }; -const GpuControlList::More kMoreForEntry48 = { +const GpuControlList::More kMoreForEntry48_1440601243 = { GpuControlList::kGLTypeNone, // gl_type {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, nullptr}, // gl_version @@ -508,7 +1297,8 @@ const GpuControlList::More kMoreForEntry48 = { nullptr}, // pixel_shader_version true, // in_process_gpu 0, // gl_reset_notification_strategy - true, // direct_rendering + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, nullptr}, // gpu_count GpuControlList::kDontCare, // hardware_overlay @@ -519,6 +1309,22 @@ const int kFeatureListForGpuControlTestingEntry49[1] = { TEST_FEATURE_0, }; +const GpuControlList::More kMoreForEntry49_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry50[1] = { TEST_FEATURE_0, }; @@ -531,6 +1337,22 @@ const GpuControlList::DriverInfo kDriverInfoForGpuControlTestingEntry50 = { nullptr}, // driver_date }; +const GpuControlList::More kMoreForEntry50_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry51[1] = { TEST_FEATURE_0, }; @@ -543,10 +1365,42 @@ const GpuControlList::DriverInfo kDriverInfoForGpuControlTestingEntry51 = { nullptr}, // driver_date }; +const GpuControlList::More kMoreForEntry51_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry52[1] = { TEST_FEATURE_0, }; +const GpuControlList::More kMoreForEntry52_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const GpuControlList::GLStrings kGLStringsForGpuControlTestingEntry52Exception0 = { nullptr, @@ -555,10 +1409,42 @@ const GpuControlList::GLStrings nullptr, }; +const GpuControlList::More kMoreForEntry52_1440601243Exception0 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry53[1] = { TEST_FEATURE_0, }; +const GpuControlList::More kMoreForEntry53_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry54[1] = { TEST_FEATURE_0, }; @@ -571,21 +1457,69 @@ const GpuControlList::DriverInfo kDriverInfoForGpuControlTestingEntry54 = { nullptr}, // driver_date }; +const GpuControlList::More kMoreForEntry54_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const char* const kDisabledExtensionsForEntry55[2] = { "test_extension2", "test_extension1", }; +const GpuControlList::More kMoreForEntry55_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const char* const kDisabledExtensionsForEntry56[2] = { "test_extension3", "test_extension2", }; +const GpuControlList::More kMoreForEntry56_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry57[1] = { TEST_FEATURE_1, }; -const GpuControlList::More kMoreForEntry57 = { +const GpuControlList::More kMoreForEntry57_1440601243 = { GpuControlList::kGLTypeNone, // gl_type {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, nullptr}, // gl_version @@ -593,7 +1527,8 @@ const GpuControlList::More kMoreForEntry57 = { nullptr}, // pixel_shader_version false, // in_process_gpu 0, // gl_reset_notification_strategy - false, // direct_rendering + {GpuControlList::kGE, GpuControlList::kVersionStyleNumerical, "2", + nullptr}, // direct_rendering_version {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, nullptr}, // gpu_count GpuControlList::kDontCare, // hardware_overlay @@ -604,11 +1539,27 @@ const int kFeatureListForGpuControlTestingEntry58[1] = { TEST_FEATURE_0, }; +const GpuControlList::More kMoreForEntry58_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry59[1] = { TEST_FEATURE_0, }; -const GpuControlList::More kMoreForEntry59 = { +const GpuControlList::More kMoreForEntry59_1440601243 = { GpuControlList::kGLTypeNone, // gl_type {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, nullptr}, // gl_version @@ -616,7 +1567,8 @@ const GpuControlList::More kMoreForEntry59 = { nullptr}, // pixel_shader_version false, // in_process_gpu 0, // gl_reset_notification_strategy - true, // direct_rendering + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, nullptr}, // gpu_count GpuControlList::kDontCare, // hardware_overlay @@ -627,7 +1579,7 @@ const int kFeatureListForGpuControlTestingEntry60[1] = { TEST_FEATURE_1, }; -const GpuControlList::More kMoreForEntry60 = { +const GpuControlList::More kMoreForEntry60_1440601243 = { GpuControlList::kGLTypeNone, // gl_type {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, nullptr}, // gl_version @@ -635,7 +1587,8 @@ const GpuControlList::More kMoreForEntry60 = { nullptr}, // pixel_shader_version false, // in_process_gpu 0, // gl_reset_notification_strategy - true, // direct_rendering + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, nullptr}, // gpu_count GpuControlList::kDontCare, // hardware_overlay @@ -651,6 +1604,22 @@ const GpuSeriesType kGpuSeriesForEntry61[2] = { GpuSeriesType::kIntelKabyLake, }; +const GpuControlList::More kMoreForEntry61_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry62[1] = { TEST_FEATURE_0, }; @@ -659,6 +1628,22 @@ const GpuSeriesType kGpuSeriesForEntry62[1] = { GpuSeriesType::kIntelKabyLake, }; +const GpuControlList::More kMoreForEntry62_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry63[1] = { TEST_FEATURE_0, }; @@ -667,6 +1652,22 @@ const GpuSeriesType kGpuSeriesForEntry63[1] = { GpuSeriesType::kIntelKabyLake, }; +const GpuControlList::More kMoreForEntry63_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry64[1] = { TEST_FEATURE_0, }; @@ -675,6 +1676,22 @@ const GpuSeriesType kGpuSeriesForEntry64[1] = { GpuSeriesType::kIntelKabyLake, }; +const GpuControlList::More kMoreForEntry64_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry65[1] = { TEST_FEATURE_0, }; @@ -683,14 +1700,62 @@ const GpuSeriesType kGpuSeriesForEntry65[1] = { GpuSeriesType::kIntelKabyLake, }; +const GpuControlList::More kMoreForEntry65_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry66[1] = { TEST_FEATURE_0, }; +const GpuControlList::More kMoreForEntry66_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const GpuSeriesType kGpuSeriesForEntry66Exception0[1] = { GpuSeriesType::kIntelKabyLake, }; +const GpuControlList::More kMoreForEntry66_1440601243Exception0 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry67[1] = { TEST_FEATURE_0, }; @@ -703,11 +1768,27 @@ const GpuControlList::DriverInfo kDriverInfoForGpuControlTestingEntry67 = { nullptr}, // driver_date }; +const GpuControlList::More kMoreForEntry67_1440601243 = { + GpuControlList::kGLTypeNone, // gl_type + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gl_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // pixel_shader_version + false, // in_process_gpu + 0, // gl_reset_notification_strategy + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // gpu_count + GpuControlList::kDontCare, // hardware_overlay + 0, // test_group +}; + const int kFeatureListForGpuControlTestingEntry68[1] = { TEST_FEATURE_0, }; -const GpuControlList::More kMoreForEntry68 = { +const GpuControlList::More kMoreForEntry68_1440601243 = { GpuControlList::kGLTypeNone, // gl_type {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, nullptr}, // gl_version @@ -715,7 +1796,8 @@ const GpuControlList::More kMoreForEntry68 = { nullptr}, // pixel_shader_version false, // in_process_gpu 0, // gl_reset_notification_strategy - true, // direct_rendering + {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, + nullptr}, // direct_rendering_version {GpuControlList::kUnknown, GpuControlList::kVersionStyleNumerical, nullptr, nullptr}, // gpu_count GpuControlList::kUnsupported, // hardware_overlay diff --git a/chromium/gpu/config/gpu_control_list_testing_autogen.cc b/chromium/gpu/config/gpu_control_list_testing_autogen.cc index 7601e14f721..b71fbeb0de2 100644 --- a/chromium/gpu/config/gpu_control_list_testing_autogen.cc +++ b/chromium/gpu/config/gpu_control_list_testing_autogen.cc @@ -41,7 +41,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry1_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -71,7 +71,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry2_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -101,7 +101,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry3_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -131,7 +131,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry4_1440601243, // more data }, base::size(kExceptionsForEntry4), // exceptions count kExceptionsForEntry4, // exceptions @@ -161,7 +161,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry5_1440601243, // more data }, base::size(kExceptionsForEntry5), // exceptions count kExceptionsForEntry5, // exceptions @@ -191,7 +191,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry6_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -221,7 +221,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry7_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -251,7 +251,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry8_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -281,7 +281,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - &kMoreForEntry9, // more data + &kMoreForEntry9_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -311,7 +311,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - &kMoreForEntry10, // more data + &kMoreForEntry10_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -341,7 +341,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - &kMoreForEntry11, // more data + &kMoreForEntry11_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -371,7 +371,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry12_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -401,7 +401,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry13_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -431,7 +431,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry14_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -461,7 +461,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry15_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -491,7 +491,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry16_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -521,7 +521,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry17_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -551,7 +551,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry18_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -581,7 +581,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry19_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -611,7 +611,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry20_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -641,7 +641,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry21_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -671,7 +671,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry22_1440601243, // more data }, base::size(kExceptionsForEntry22), // exceptions count kExceptionsForEntry22, // exceptions @@ -701,7 +701,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - &kMoreForEntry23, // more data + &kMoreForEntry23_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -731,7 +731,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry24_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -761,7 +761,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry25_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -792,7 +792,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry26_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -822,7 +822,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { &kMachineModelInfoForEntry27, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry27_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -852,7 +852,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry28_1440601243, // more data }, base::size(kExceptionsForEntry28), // exceptions count kExceptionsForEntry28, // exceptions @@ -882,7 +882,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { &kMachineModelInfoForEntry29, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry29_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -912,7 +912,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { &kMachineModelInfoForEntry30, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry30_1440601243, // more data }, base::size(kExceptionsForEntry30), // exceptions count kExceptionsForEntry30, // exceptions @@ -943,7 +943,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry31_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -974,7 +974,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry32_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -1005,7 +1005,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry33_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -1036,7 +1036,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry34_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -1067,7 +1067,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry35_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -1098,7 +1098,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry36_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -1128,7 +1128,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry37_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -1159,7 +1159,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry38_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -1189,7 +1189,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry39_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -1219,7 +1219,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - &kMoreForEntry40, // more data + &kMoreForEntry40_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -1249,7 +1249,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry41_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -1279,7 +1279,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry42_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -1309,7 +1309,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry43_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -1339,7 +1339,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry44_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -1369,7 +1369,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry45_1440601243, // more data }, base::size(kExceptionsForEntry45), // exceptions count kExceptionsForEntry45, // exceptions @@ -1400,7 +1400,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry46_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -1431,7 +1431,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry47_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -1461,7 +1461,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - &kMoreForEntry48, // more data + &kMoreForEntry48_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -1491,7 +1491,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry49_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -1521,7 +1521,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry50_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -1551,7 +1551,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry51_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -1581,7 +1581,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry52_1440601243, // more data }, base::size(kExceptionsForEntry52), // exceptions count kExceptionsForEntry52, // exceptions @@ -1611,7 +1611,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry53_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -1641,7 +1641,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry54_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -1671,7 +1671,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry55_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -1701,7 +1701,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry56_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -1731,7 +1731,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - &kMoreForEntry57, // more data + &kMoreForEntry57_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -1761,7 +1761,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry58_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -1791,7 +1791,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - &kMoreForEntry59, // more data + &kMoreForEntry59_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -1821,7 +1821,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - &kMoreForEntry60, // more data + &kMoreForEntry60_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -1851,7 +1851,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info base::size(kGpuSeriesForEntry61), // gpu_series size kGpuSeriesForEntry61, // gpu_series - nullptr, // more conditions + &kMoreForEntry61_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -1881,7 +1881,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info base::size(kGpuSeriesForEntry62), // gpu_series size kGpuSeriesForEntry62, // gpu_series - nullptr, // more conditions + &kMoreForEntry62_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -1911,7 +1911,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info base::size(kGpuSeriesForEntry63), // gpu_series size kGpuSeriesForEntry63, // gpu_series - nullptr, // more conditions + &kMoreForEntry63_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -1941,7 +1941,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info base::size(kGpuSeriesForEntry64), // gpu_series size kGpuSeriesForEntry64, // gpu_series - nullptr, // more conditions + &kMoreForEntry64_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -1971,7 +1971,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info base::size(kGpuSeriesForEntry65), // gpu_series size kGpuSeriesForEntry65, // gpu_series - nullptr, // more conditions + &kMoreForEntry65_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -2001,7 +2001,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry66_1440601243, // more data }, base::size(kExceptionsForEntry66), // exceptions count kExceptionsForEntry66, // exceptions @@ -2031,7 +2031,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry67_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions @@ -2061,7 +2061,7 @@ const GpuControlList::Entry kGpuControlListTestingEntries[] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - &kMoreForEntry68, // more data + &kMoreForEntry68_1440601243, // more data }, 0, // exceptions count nullptr, // exceptions diff --git a/chromium/gpu/config/gpu_control_list_testing_exceptions_autogen.h b/chromium/gpu/config/gpu_control_list_testing_exceptions_autogen.h index 1adc7d78ebe..49b04a3faac 100644 --- a/chromium/gpu/config/gpu_control_list_testing_exceptions_autogen.h +++ b/chromium/gpu/config/gpu_control_list_testing_exceptions_autogen.h @@ -27,7 +27,7 @@ const GpuControlList::Conditions kExceptionsForEntry4[1] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry4_1440601243Exception0, // more data }, }; @@ -46,7 +46,7 @@ const GpuControlList::Conditions kExceptionsForEntry5[1] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry5_1440601243Exception0, // more data }, }; @@ -65,7 +65,7 @@ const GpuControlList::Conditions kExceptionsForEntry22[1] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry22_1440601243Exception0, // more data }, }; @@ -84,7 +84,7 @@ const GpuControlList::Conditions kExceptionsForEntry28[1] = { &kMachineModelInfoForEntry28Exception0, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry28_1440601243Exception0, // more data }, }; @@ -103,7 +103,7 @@ const GpuControlList::Conditions kExceptionsForEntry30[1] = { &kMachineModelInfoForEntry30Exception0, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry30_1440601243Exception0, // more data }, }; @@ -120,10 +120,10 @@ const GpuControlList::Conditions kExceptionsForEntry45[2] = { GpuControlList::kMultiGpuStyleNone, // multi_gpu_style &kDriverInfoForGpuControlTestingEntry45Exception0, // driver info nullptr, // GL strings - nullptr, // machine model info - 0, // gpu_series size - nullptr, // gpu_series - nullptr, // more conditions + nullptr, // machine model info + 0, // gpu_series size + nullptr, // gpu_series + &kMoreForEntry45_1440601243Exception0, // more data }, { GpuControlList::kOsAny, // os_type @@ -137,10 +137,10 @@ const GpuControlList::Conditions kExceptionsForEntry45[2] = { GpuControlList::kMultiGpuStyleNone, // multi_gpu_style &kDriverInfoForGpuControlTestingEntry45Exception1, // driver info nullptr, // GL strings - nullptr, // machine model info - 0, // gpu_series size - nullptr, // gpu_series - nullptr, // more conditions + nullptr, // machine model info + 0, // gpu_series size + nullptr, // gpu_series + &kMoreForEntry45_1440601243Exception1, // more data }, }; @@ -159,7 +159,7 @@ const GpuControlList::Conditions kExceptionsForEntry52[1] = { nullptr, // machine model info 0, // gpu_series size nullptr, // gpu_series - nullptr, // more conditions + &kMoreForEntry52_1440601243Exception0, // more data }, }; @@ -178,7 +178,7 @@ const GpuControlList::Conditions kExceptionsForEntry66[1] = { nullptr, // machine model info base::size(kGpuSeriesForEntry66Exception0), // gpu_series size kGpuSeriesForEntry66Exception0, // gpu_series - nullptr, // more conditions + &kMoreForEntry66_1440601243Exception0, // more data }, }; diff --git a/chromium/gpu/config/gpu_crash_keys.cc b/chromium/gpu/config/gpu_crash_keys.cc index 9218c7a0022..a51c27ad6e8 100644 --- a/chromium/gpu/config/gpu_crash_keys.cc +++ b/chromium/gpu/config/gpu_crash_keys.cc @@ -22,6 +22,16 @@ crash_reporter::CrashKeyString<128> gpu_renderer("gpu-gl-renderer"); #endif crash_reporter::CrashKeyString<4> gpu_gl_context_is_virtual( "gpu-gl-context-is-virtual"); +crash_reporter::CrashKeyString<20> seconds_since_last_progress_report( + "seconds-since-last-progress-report"); +crash_reporter::CrashKeyString<20> seconds_since_last_suspend( + "seconds-since-last-suspend"); +crash_reporter::CrashKeyString<20> seconds_since_last_resume( + "seconds-since-last-resume"); +crash_reporter::CrashKeyString<20> seconds_since_last_logging( + "seconds-since-last-logging"); +crash_reporter::CrashKeyString<20> available_physical_memory_in_mb( + "available-physical-memory-in-mb"); } // namespace crash_keys } // namespace gpu diff --git a/chromium/gpu/config/gpu_crash_keys.h b/chromium/gpu/config/gpu_crash_keys.h index 3d099b728af..e6bee5b8b83 100644 --- a/chromium/gpu/config/gpu_crash_keys.h +++ b/chromium/gpu/config/gpu_crash_keys.h @@ -27,6 +27,13 @@ extern GPU_EXPORT crash_reporter::CrashKeyString<256> gpu_vendor; extern GPU_EXPORT crash_reporter::CrashKeyString<128> gpu_renderer; #endif extern GPU_EXPORT crash_reporter::CrashKeyString<4> gpu_gl_context_is_virtual; +extern GPU_EXPORT crash_reporter::CrashKeyString<20> + seconds_since_last_progress_report; +extern GPU_EXPORT crash_reporter::CrashKeyString<20> seconds_since_last_suspend; +extern GPU_EXPORT crash_reporter::CrashKeyString<20> seconds_since_last_resume; +extern GPU_EXPORT crash_reporter::CrashKeyString<20> seconds_since_last_logging; +extern GPU_EXPORT crash_reporter::CrashKeyString<20> + available_physical_memory_in_mb; } // namespace crash_keys } // namespace gpu diff --git a/chromium/gpu/config/gpu_driver_bug_list.json b/chromium/gpu/config/gpu_driver_bug_list.json index c02208ca061..ef98bd00ed3 100644 --- a/chromium/gpu/config/gpu_driver_bug_list.json +++ b/chromium/gpu/config/gpu_driver_bug_list.json @@ -1612,23 +1612,19 @@ "id": 172, "description": "Use GL_INTEL_framebuffer_CMAA on ChromeOS", "cr_bugs": [535198], - "exceptions" : [ - { - "os": { - "type" : "chromeos" - }, - "vendor_id": "0x8086", - "driver_vendor": "Mesa", - "gl_vendor": "Intel.*", - "gl_type": "gles", - "gl_version": { - "op": ">=", - "value": "3.1" - } - } - ], + "os": { + "type" : "chromeos" + }, + "vendor_id": "0x8086", + "driver_vendor": "Mesa", + "gl_vendor": "Intel.*", + "gl_type": "gles", + "gl_version": { + "op": ">=", + "value": "3.1" + }, "features": [ - "disable_framebuffer_cmaa" + "use_framebuffer_cmaa" ] }, { @@ -1869,6 +1865,10 @@ }, "gl_type": "gl", "gl_version_string": ".*Mesa.*", + "direct_rendering_version": { + "op" : "<", + "value": "2.3" + }, "features": [ "disable_post_sub_buffers_for_onscreen_surfaces" ] @@ -2413,7 +2413,7 @@ { "id": 233, "description": "Delayed copy NV12 displays incorrect colors on NVIDIA drivers.", - "cr_bugs": [727216], + "cr_bugs": [728670], "os": { "type": "win" }, @@ -2584,19 +2584,6 @@ ] }, { - "id": 248, - "description": "Direct composition causes slow presents on Intel Sandybridge", - "cr_bugs": [775898, 785648], - "os": { - "type": "win" - }, - "vendor_id": "0x8086", - "device_id": ["0x0116"], - "features": [ - "disable_direct_composition" - ] - }, - { "id": 249, "description": "Direct composition causes slow presents on old Nvidia GPUs", "cr_bugs": [775898], @@ -3258,6 +3245,67 @@ "features": [ "exit_on_context_lost" ] + }, + { + "id": 300, + "cr_bugs": [775898, 785648, 9245627], + "description": "Direct composition causes rendering issues on Intel SandyBridge and IvyBridge GPUs", + "os": { + "type" : "win" + }, + "gpu_series": [ + "intel_sandybridge", + "intel_ivybridge" + ], + "features": [ + "disable_direct_composition" + ] + }, + { + "id": 301, + "description": "Mesa hangs the system when allocating large textures", + "cr_bugs": [927470], + "os": { + "type" : "linux" + }, + "driver_vendor": "Mesa", + "driver_version": { + "op": ">=", + "value": "18" + }, + "features": [ + "max_texture_size_limit_4096", + "max_3d_array_texture_size_1024" + ] + }, + { + "id": 302, + "description": "glCopyTexImage2D on Mali-T820 fails in certain cases if source is GL_RGB10_A2.", + "cr_bugs": [953771], + "os": { + "type": "android" + }, + "gl_vendor": "ARM.*", + "gl_renderer": "Mali-T820", + "features": [ + "disable_copy_tex_image_2d_rgb10_a2_mali" + ] + }, + { + "id": 303, + "cr_bugs": [890227], + "description": "Dynamic texture map crashes on Intel drivers less than version 24", + "os": { + "type" : "win" + }, + "vendor_id": "0x8086", + "driver_version": { + "op": "<", + "value": "24" + }, + "features": [ + "disable_nv12_dynamic_textures" + ] } ] } diff --git a/chromium/gpu/config/gpu_driver_bug_workarounds.cc b/chromium/gpu/config/gpu_driver_bug_workarounds.cc index bd29c9e0595..2734a21f923 100644 --- a/chromium/gpu/config/gpu_driver_bug_workarounds.cc +++ b/chromium/gpu/config/gpu_driver_bug_workarounds.cc @@ -32,6 +32,9 @@ void IntSetToWorkarounds(const std::vector<int32_t>& enabled_workarounds, workarounds->max_copy_texture_chromium_size = 1048576; if (workarounds->max_copy_texture_chromium_size_262144) workarounds->max_copy_texture_chromium_size = 262144; + + if (workarounds->max_3d_array_texture_size_1024) + workarounds->max_3d_array_texture_size = 1024; } GLint LowerMax(GLint max0, GLint max1) { @@ -76,6 +79,8 @@ void GpuDriverBugWorkarounds::Append(const GpuDriverBugWorkarounds& extra) { max_texture_size = LowerMax(max_texture_size, extra.max_texture_size); max_copy_texture_chromium_size = LowerMax( max_copy_texture_chromium_size, extra.max_copy_texture_chromium_size); + max_3d_array_texture_size = + LowerMax(max_3d_array_texture_size, extra.max_3d_array_texture_size); } } // namespace gpu diff --git a/chromium/gpu/config/gpu_driver_bug_workarounds.h b/chromium/gpu/config/gpu_driver_bug_workarounds.h index 6618597555c..1d9d56670f5 100644 --- a/chromium/gpu/config/gpu_driver_bug_workarounds.h +++ b/chromium/gpu/config/gpu_driver_bug_workarounds.h @@ -39,6 +39,7 @@ class GPU_EXPORT GpuDriverBugWorkarounds { // Note: 0 here means use driver limit. GLint max_texture_size = 0; + GLint max_3d_array_texture_size = 0; GLint max_copy_texture_chromium_size = 0; }; diff --git a/chromium/gpu/config/gpu_finch_features.cc b/chromium/gpu/config/gpu_finch_features.cc index f81d1e743a9..5b8e38fffe8 100644 --- a/chromium/gpu/config/gpu_finch_features.cc +++ b/chromium/gpu/config/gpu_finch_features.cc @@ -72,7 +72,7 @@ const base::Feature kDirectCompositionPreferNV12Overlays{ // can be used even if there are controls on top of the video. It can be // enabled only when overlay is supported. const base::Feature kDirectCompositionUnderlays{ - "DirectCompositionUnderlays", base::FEATURE_DISABLED_BY_DEFAULT}; + "DirectCompositionUnderlays", base::FEATURE_ENABLED_BY_DEFAULT}; // Causes us to use the SharedImageManager, removing support for the old // mailbox system. Any consumers of the GPU process using the old mailbox @@ -89,7 +89,7 @@ const base::Feature kUseDCOverlaysForSoftwareProtectedVideo{ // Use decode swap chain created from compatible video decoder buffers. const base::Feature kDirectCompositionUseNV12DecodeSwapChain{ "DirectCompositionUseNV12DecodeSwapChain", - base::FEATURE_DISABLED_BY_DEFAULT}; + base::FEATURE_ENABLED_BY_DEFAULT}; // Controls the decode acceleration of JPEG images (as opposed to camera // captures) in Chrome OS using the VA-API. diff --git a/chromium/gpu/config/gpu_info.cc b/chromium/gpu/config/gpu_info.cc index 38abaf0102c..15e6b3014ec 100644 --- a/chromium/gpu/config/gpu_info.cc +++ b/chromium/gpu/config/gpu_info.cc @@ -67,6 +67,8 @@ const char* ImageDecodeAcceleratorSubsamplingToString( return "4:2:0"; case gpu::ImageDecodeAcceleratorSubsampling::k422: return "4:2:2"; + case gpu::ImageDecodeAcceleratorSubsampling::k444: + return "4:4:4"; } } @@ -186,7 +188,6 @@ GPUInfo::GPUInfo() amd_switchable(false), gl_reset_notification_strategy(0), software_rendering(false), - direct_rendering(true), sandboxed(false), in_process_gpu(true), passthrough_cmd_decoder(false), @@ -243,7 +244,7 @@ void GPUInfo::EnumerateFields(Enumerator* enumerator) const { std::string gl_ws_extensions; uint32_t gl_reset_notification_strategy; bool software_rendering; - bool direct_rendering; + std::string direct_rendering_version; bool sandboxed; bool in_process_gpu; bool passthrough_cmd_decoder; @@ -306,7 +307,7 @@ void GPUInfo::EnumerateFields(Enumerator* enumerator) const { static_cast<int>(gl_reset_notification_strategy)); // TODO(kbr): add performance_stats. enumerator->AddBool("softwareRendering", software_rendering); - enumerator->AddBool("directRendering", direct_rendering); + enumerator->AddString("directRenderingVersion", direct_rendering_version); enumerator->AddBool("sandboxed", sandboxed); enumerator->AddBool("inProcessGpu", in_process_gpu); enumerator->AddBool("passthroughCmdDecoder", passthrough_cmd_decoder); diff --git a/chromium/gpu/config/gpu_info.h b/chromium/gpu/config/gpu_info.h index 88420f366f2..15a2b8d9e07 100644 --- a/chromium/gpu/config/gpu_info.h +++ b/chromium/gpu/config/gpu_info.h @@ -122,7 +122,8 @@ enum class ImageDecodeAcceleratorType { enum class ImageDecodeAcceleratorSubsampling { k420 = 0, k422 = 1, - kMaxValue = k422, + k444 = 2, + kMaxValue = k444, }; // Specification of an image decoding profile supported by a hardware decoder. @@ -295,9 +296,12 @@ struct GPU_EXPORT GPUInfo { bool software_rendering; - // Whether the driver uses direct rendering. True on most platforms, false on - // X11 when using remote X. - bool direct_rendering; + // Empty means unknown. Defined on X11 as + // - "1" means indirect (versions can't be all zero) + // - "2" means some type of direct rendering, but version cannot not be + // reliably determined + // - "2.1", "2.2", "2.3" for DRI, DRI2, DRI3 respectively + std::string direct_rendering_version; // Whether the gpu process is running in a sandbox. bool sandboxed; diff --git a/chromium/gpu/config/gpu_info_collector.cc b/chromium/gpu/config/gpu_info_collector.cc index d5737b62f17..79d1a7f4cba 100644 --- a/chromium/gpu/config/gpu_info_collector.cc +++ b/chromium/gpu/config/gpu_info_collector.cc @@ -226,11 +226,13 @@ bool CollectGraphicsInfoGL(GPUInfo* gpu_info, gfx::HasExtension(extension_set, "GL_OES_EGL_image"); #else gl::GLWindowSystemBindingInfo window_system_binding_info; - if (gl::init::GetGLWindowSystemBindingInfo(&window_system_binding_info)) { + if (gl::init::GetGLWindowSystemBindingInfo(gl_info, + &window_system_binding_info)) { gpu_info->gl_ws_vendor = window_system_binding_info.vendor; gpu_info->gl_ws_version = window_system_binding_info.version; gpu_info->gl_ws_extensions = window_system_binding_info.extensions; - gpu_info->direct_rendering = window_system_binding_info.direct_rendering; + gpu_info->direct_rendering_version = + window_system_binding_info.direct_rendering_version; } #endif // OS_ANDROID diff --git a/chromium/gpu/config/gpu_info_collector_fuchsia.cc b/chromium/gpu/config/gpu_info_collector_fuchsia.cc index 6d93e68c228..d285e4bb563 100644 --- a/chromium/gpu/config/gpu_info_collector_fuchsia.cc +++ b/chromium/gpu/config/gpu_info_collector_fuchsia.cc @@ -18,8 +18,7 @@ bool CollectContextGraphicsInfo(GPUInfo* gpu_info, } bool CollectBasicGraphicsInfo(GPUInfo* gpu_info) { - // TODO(crbug.com/707031): Implement this. - NOTIMPLEMENTED(); + // TODO(https://crbug.com/950587): Implement this. return false; } diff --git a/chromium/gpu/config/gpu_lists_version.h b/chromium/gpu/config/gpu_lists_version.h index dea28bec633..f425d5b6dd5 100644 --- a/chromium/gpu/config/gpu_lists_version.h +++ b/chromium/gpu/config/gpu_lists_version.h @@ -3,6 +3,6 @@ #ifndef GPU_CONFIG_GPU_LISTS_VERSION_H_ #define GPU_CONFIG_GPU_LISTS_VERSION_H_ -#define GPU_LISTS_VERSION "7e9e689503f506e8e943b05c4f50c0c3e6597794" +#define GPU_LISTS_VERSION "75fcf24dd8773d5959a7177f492969e627d83c01" #endif // GPU_CONFIG_GPU_LISTS_VERSION_H_ diff --git a/chromium/gpu/config/gpu_preferences.h b/chromium/gpu/config/gpu_preferences.h index b5d39972765..838aab5ce60 100644 --- a/chromium/gpu/config/gpu_preferences.h +++ b/chromium/gpu/config/gpu_preferences.h @@ -195,16 +195,23 @@ struct GPU_EXPORT GpuPreferences { bool disable_oop_rasterization = false; bool enable_oop_rasterization_ddl = false; - bool enable_raster_to_sk_image = false; - bool enable_passthrough_raster_decoder = false; // Start the watchdog suspended, as the app is already backgrounded and won't // send a background/suspend signal. bool watchdog_starts_backgrounded = false; + // =================================== + // Settings from //gpu/command_buffer/service/gpu_switches.h // Use Vulkan for rasterization and display compositing. bool enable_vulkan = false; + // Use vulkan VK_KHR_surface for presenting. + bool disable_vulkan_surface = false; + + // If Vulkan initialization has failed, do not fallback to GL. This is for + // testing in order to detect regressions which crash Vulkan. + bool disable_vulkan_fallback_to_gl_for_testing = false; + // =================================== // Settings from //cc/base/switches.h // Enable the GPU benchmarking extension; used by tests only. diff --git a/chromium/gpu/config/gpu_util.cc b/chromium/gpu/config/gpu_util.cc index 7c5e2d9a28b..2fd0939ad6c 100644 --- a/chromium/gpu/config/gpu_util.cc +++ b/chromium/gpu/config/gpu_util.cc @@ -80,6 +80,13 @@ GpuFeatureStatus GetOopRasterizationFeatureStatus( const base::CommandLine& command_line, const GpuPreferences& gpu_preferences, const GPUInfo& gpu_info) { +#if defined(OS_WIN) + // On Windows, using the validating decoder causes a lot of errors. This + // could be fixed independently, but validating decoder is going away. + // See: http://crbug.com/949773. + if (!gpu_info.passthrough_cmd_decoder) + return kGpuFeatureStatusDisabled; +#endif // OOP rasterization requires GPU rasterization, so if blacklisted or // disabled, report the same. auto status = @@ -92,10 +99,6 @@ GpuFeatureStatus GetOopRasterizationFeatureStatus( if (!gpu_info.oop_rasterization_supported) return kGpuFeatureStatusDisabled; - if (gpu_preferences.use_passthrough_cmd_decoder && - !gpu_preferences.enable_passthrough_raster_decoder) - return kGpuFeatureStatusDisabled; - if (gpu_preferences.disable_oop_rasterization) return kGpuFeatureStatusDisabled; else if (gpu_preferences.enable_oop_rasterization) diff --git a/chromium/gpu/config/gpu_workaround_list.txt b/chromium/gpu/config/gpu_workaround_list.txt index b8bb9cf53ae..5532d22be01 100644 --- a/chromium/gpu/config/gpu_workaround_list.txt +++ b/chromium/gpu/config/gpu_workaround_list.txt @@ -28,11 +28,11 @@ disable_dxgi_zero_copy_video disable_es3_gl_context disable_es3_gl_context_for_testing disable_ext_draw_buffers -disable_framebuffer_cmaa disable_gl_rgb_format disable_larger_than_screen_overlays disable_non_empty_post_sub_buffers_for_onscreen_surfaces disable_nv12_dxgi_video +disable_nv12_dynamic_textures disable_overlay_ca_layers disable_post_sub_buffers_for_onscreen_surfaces disable_program_cache @@ -101,6 +101,7 @@ unpack_image_height_workaround_with_unpack_buffer unpack_overlapping_rows_separately_unpack_buffer use_client_side_arrays_for_stream_buffers use_es2_for_oopr +use_framebuffer_cmaa use_gpu_driver_workaround_for_testing use_intermediary_for_copy_texture_image use_non_zero_size_for_client_side_stream_buffers @@ -112,3 +113,5 @@ use_copyteximage2d_instead_of_readpixels_on_multisampled_textures disable_copy_tex_image_2d_rgb10_a2_adreno disable_copy_tex_image_2d_rgb10_a2_tegra use_eqaa_storage_samples_2 +max_3d_array_texture_size_1024 +disable_copy_tex_image_2d_rgb10_a2_mali diff --git a/chromium/gpu/config/process_json.py b/chromium/gpu/config/process_json.py index c4faaf27ab0..d595c6da274 100755 --- a/chromium/gpu/config/process_json.py +++ b/chromium/gpu/config/process_json.py @@ -9,6 +9,7 @@ import json import os import platform import sys +import zlib from optparse import OptionParser from subprocess import call @@ -37,7 +38,7 @@ _OS_TYPE_MAP = { def load_software_rendering_list_features(feature_type_filename): - header_file = open(feature_type_filename, 'rb') + header_file = open(feature_type_filename, 'r') start = False features = [] for line in header_file: @@ -66,7 +67,7 @@ def load_software_rendering_list_features(feature_type_filename): def load_gpu_driver_bug_workarounds(workaround_type_filename): - header_file = open(workaround_type_filename, 'rb') + header_file = open(workaround_type_filename, 'r') start = False workaround = None workarounds = [] @@ -188,14 +189,14 @@ def write_version(version_info, name_tag, data_file): 'between': 'kBetween', '': 'kUnknown', } - assert op_map.has_key(op) + assert op in op_map data_file.write('GpuControlList::%s, ' % op_map[op]) style_map = { 'lexical': 'Lexical', 'numerical': 'Numerical', '': 'Numerical', } - assert style_map.has_key(style) + assert style in style_map data_file.write('GpuControlList::kVersionStyle%s, ' % style_map[style]) write_string(version1, data_file) data_file.write(', ') @@ -300,7 +301,7 @@ def write_machine_model_info(entry_id, is_exception, exception_id, def write_os_type(os_type, data_file): - assert _OS_TYPE_MAP.has_key(os_type) + assert os_type in _OS_TYPE_MAP data_file.write('GpuControlList::%s, // os_type\n' % _OS_TYPE_MAP[os_type]) @@ -312,7 +313,7 @@ def write_multi_gpu_category(multi_gpu_category, data_file): 'any': 'Any', '': 'None', } - assert map.has_key(multi_gpu_category) + assert multi_gpu_category in map data_file.write( 'GpuControlList::kMultiGpuCategory%s, // multi_gpu_category\n' % map[multi_gpu_category]) @@ -326,7 +327,7 @@ def write_multi_gpu_style(multi_gpu_style, data_file): 'amd_switchable_integrated': 'AMDSwitchableIntegrated', '': 'None', } - assert map.has_key(multi_gpu_style) + assert multi_gpu_style in map data_file.write( 'GpuControlList::kMultiGpuStyle%s, // multi_gpu_style\n' % map[multi_gpu_style]) @@ -339,7 +340,7 @@ def write_gl_type(gl_type, data_file): 'angle': 'ANGLE', '': 'None', } - assert map.has_key(gl_type) + assert gl_type in map data_file.write('GpuControlList::kGLType%s, // gl_type\n' % map[gl_type]) @@ -351,7 +352,7 @@ def write_supported_or_not(feature_value, feature_name, data_file): 'unsupported': 'Unsupported', 'dont_care': 'DontCare', } - assert map.has_key(feature_value) + assert feature_value in map data_file.write('GpuControlList::k%s, // %s\n' % (map[feature_value], feature_name)) @@ -378,7 +379,7 @@ def write_conditions(entry_id, is_exception, exception_id, entry, pixel_shader_version = None in_process_gpu = False gl_reset_notification_strategy = None - direct_rendering = True + direct_rendering_version = '' gpu_count = None hardware_overlay = None test_group = 0 @@ -451,9 +452,8 @@ def write_conditions(entry_id, is_exception, exception_id, entry, in_process_gpu = True elif key == 'gl_reset_notification_strategy': gl_reset_notification_strategy = entry[key] - elif key == 'direct_rendering': - assert not entry[key] - direct_rendering = False + elif key == 'direct_rendering_version': + direct_rendering_version = entry[key] elif key == 'gpu_count': gpu_count = entry[key] elif key == 'hardware_overlay': @@ -502,13 +502,13 @@ def write_conditions(entry_id, is_exception, exception_id, entry, data_file, data_helper_file) # group a bunch of less used conditions if (gl_version != None or pixel_shader_version != None or in_process_gpu or - gl_reset_notification_strategy != None or (not direct_rendering) or - gpu_count != None or hardware_overlay != None or test_group != 0): + gl_reset_notification_strategy != None or direct_rendering_version != None + or gpu_count != None or hardware_overlay != None or test_group != 0): write_entry_more_data(entry_id, is_exception, exception_id, gl_type, gl_version, pixel_shader_version, in_process_gpu, - gl_reset_notification_strategy, direct_rendering, - gpu_count, hardware_overlay, test_group, data_file, - data_helper_file) + gl_reset_notification_strategy, + direct_rendering_version, gpu_count, hardware_overlay, + test_group, data_file, data_helper_file) else: data_file.write('nullptr, // more conditions\n') @@ -535,7 +535,7 @@ def write_gpu_series_list(entry_id, is_exception, exception_id, gpu_series_list, 'intel_coffeelake': 'kIntelCoffeeLake', } for series in gpu_series_list: - assert gpu_series_map.has_key(series) + assert series in gpu_series_map data_helper_file.write('GpuSeriesType::%s,\n' % gpu_series_map[series]) data_helper_file.write('};\n\n') @@ -549,11 +549,18 @@ def write_gpu_series_list(entry_id, is_exception, exception_id, gpu_series_list, def write_entry_more_data(entry_id, is_exception, exception_id, gl_type, gl_version, pixel_shader_version, in_process_gpu, - gl_reset_notification_strategy, direct_rendering, - gpu_count, hardware_overlay, test_group, data_file, - data_helper_file): + gl_reset_notification_strategy, + direct_rendering_version, gpu_count, hardware_overlay, + test_group, data_file, data_helper_file): # write more data - var_name = 'kMoreForEntry' + str(entry_id) + + # Generate a unique name for jumbo build which concatenates multiple + # translation units into one to speed compilation. + basename = os.path.basename(data_helper_file.name) + # & 0xffffffff converts to unsigned to keep consistent across Python versions + # and platforms as per https://docs.python.org/3/library/zlib.html + suffix = '_%s' % (zlib.crc32(basename.encode()) & 0xffffffff) + var_name = 'kMoreForEntry' + str(entry_id) + suffix if is_exception: var_name += 'Exception' + str(exception_id) data_helper_file.write('const GpuControlList::More %s = {\n' % var_name) @@ -565,7 +572,8 @@ def write_entry_more_data(entry_id, is_exception, exception_id, gl_type, gl_reset_notification_strategy = '0' data_helper_file.write('%s, // gl_reset_notification_strategy\n' % gl_reset_notification_strategy) - write_boolean_value(direct_rendering, 'direct_rendering', data_helper_file) + write_version(direct_rendering_version, 'direct_rendering_version', + data_helper_file) write_version(gpu_count, 'gpu_count', data_helper_file) write_supported_or_not(hardware_overlay, 'hardware_overlay', data_helper_file) write_integer_value(test_group, 'test_group', data_helper_file) @@ -667,20 +675,20 @@ def process_json_file(json_filepath, list_tag, json_file = open(json_filepath, 'rb') json_data = json.load(json_file) json_file.close() - data_file = open(output_data_filepath, 'wb') + data_file = open(output_data_filepath, 'w') data_file.write(_LICENSE) data_file.write(_DO_NOT_EDIT_WARNING) data_file.write('#include "%s/%s"\n\n' % (path, output_header_filename)) data_file.write('#include "%s/%s"\n' % (path, output_helper_filename)) data_file.write('#include "%s/%s"\n\n' % (path, output_exception_filename)) - data_helper_file = open(output_helper_filepath, 'wb') + data_helper_file = open(output_helper_filepath, 'w') data_helper_file.write(_LICENSE) data_helper_file.write(_DO_NOT_EDIT_WARNING) write_header_file_guard(data_helper_file, output_helper_filename, path, True) data_helper_file.write('#include "gpu/config/%s"\n\n' % feature_header_filename) data_helper_file.write('namespace gpu {\n') - data_exception_file = open(output_exception_filepath, 'wb') + data_exception_file = open(output_exception_filepath, 'w') data_exception_file.write(_LICENSE) data_exception_file.write(_DO_NOT_EDIT_WARNING) write_header_file_guard(data_exception_file, output_exception_filename, path, @@ -698,7 +706,7 @@ def process_json_file(json_filepath, list_tag, if 'os' in entry: os_type = entry['os']['type'] # Check for typos in the .json data - if not _OS_TYPE_MAP.has_key(os_type): + if os_type not in _OS_TYPE_MAP: raise Exception('Unknown OS type "%s" for entry %d' % (os_type, entry_id)) if os_filter != None and os_type != os_filter: @@ -718,7 +726,7 @@ def process_json_file(json_filepath, list_tag, write_header_file_guard(data_exception_file, output_exception_filename, path, False) data_exception_file.close() - data_header_file = open(output_header_filepath, 'wb') + data_header_file = open(output_header_filepath, 'w') data_header_file.write(_LICENSE) data_header_file.write(_DO_NOT_EDIT_WARNING) write_header_file_guard(data_header_file, output_header_filename, path, True) @@ -830,7 +838,7 @@ def write_test_entry_enums(input_json_filepath, output_entry_enums_filepath, json_file.close() output_entry_enums_filename = os.path.basename(output_entry_enums_filepath) - enum_file = open(output_entry_enums_filepath, 'wb') + enum_file = open(output_entry_enums_filepath, 'w') enum_file.write(_LICENSE) enum_file.write(_DO_NOT_EDIT_WARNING) write_header_file_guard(enum_file, output_entry_enums_filename, path, True) diff --git a/chromium/gpu/config/software_rendering_list.json b/chromium/gpu/config/software_rendering_list.json index 5deceb6c29e..d4c3b436434 100644 --- a/chromium/gpu/config/software_rendering_list.json +++ b/chromium/gpu/config/software_rendering_list.json @@ -735,7 +735,10 @@ "os": { "type": "linux" }, - "direct_rendering": false, + "direct_rendering_version": { + "op": "<", + "value": "2" + }, "features": [ "all" ] |