Remove FLASH related support in software rendering list.

BUG=1109268
TEST=gpu_unittests
R=kbr@chromium.org,bbudge@chromium.org

Change-Id: Ib30e393d223834bea48eebadb8f465fb74a92925
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2446532Reviewed-by: Kenneth Russell <kbr@chromium.org>
Reviewed-by: Bill Budge <bbudge@chromium.org>
Reviewed-by: Will Harris <wfh@chromium.org>
Auto-Submit: Zhenyao Mo <zmo@chromium.org>
Commit-Queue: Zhenyao Mo <zmo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813397}

content/browser/gpu/gpu_data_manager_testing_arrays_and_structs_autogen.h

@@ -171,21 +171,18 @@ const GpuControlList::More kMoreForEntry5_572251052Exception0 = {
     GpuControlList::kDontCare,  // subpixel_font_rendering
 };
 
-const int kFeatureListForGpuManagerTestingEntry6[14] = {
-    GPU_FEATURE_TYPE_FLASH_STAGE3D,
+const int kFeatureListForGpuManagerTestingEntry6[11] = {
+    GPU_FEATURE_TYPE_ACCELERATED_WEBGL2,
     GPU_FEATURE_TYPE_ANDROID_SURFACE_CONTROL,
-    GPU_FEATURE_TYPE_ACCELERATED_GL,
     GPU_FEATURE_TYPE_GPU_RASTERIZATION,
-    GPU_FEATURE_TYPE_FLASH3D,
+    GPU_FEATURE_TYPE_ACCELERATED_GL,
     GPU_FEATURE_TYPE_METAL,
-    GPU_FEATURE_TYPE_ACCELERATED_WEBGL2,
     GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS,
     GPU_FEATURE_TYPE_PROTECTED_VIDEO_DECODE,
     GPU_FEATURE_TYPE_OOP_RASTERIZATION,
     GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE,
     GPU_FEATURE_TYPE_ACCELERATED_WEBGL,
     GPU_FEATURE_TYPE_VULKAN,
-    GPU_FEATURE_TYPE_FLASH_STAGE3D_BASELINE,
 };
 
 const GpuControlList::More kMoreForEntry6_572251052 = {

content/renderer/pepper/ppapi_preferences_builder.cc

@@ -21,19 +21,9 @@ ppapi::Preferences PpapiPreferencesBuilder::Build(
   ppapi_prefs.default_font_size = prefs.default_font_size;
   ppapi_prefs.default_fixed_font_size = prefs.default_fixed_font_size;
   ppapi_prefs.number_of_cpu_cores = prefs.number_of_cpu_cores;
-  ppapi_prefs.is_3d_supported =
-      (prefs.flash_3d_enabled &&
-       (gpu_feature_info.status_values[gpu::GPU_FEATURE_TYPE_FLASH3D] ==
-        gpu::kGpuFeatureStatusEnabled));
-  ppapi_prefs.is_stage3d_supported =
-      (prefs.flash_stage3d_enabled &&
-       (gpu_feature_info.status_values[gpu::GPU_FEATURE_TYPE_FLASH_STAGE3D] ==
-        gpu::kGpuFeatureStatusEnabled));
-  ppapi_prefs.is_stage3d_baseline_supported =
-      (prefs.flash_stage3d_baseline_enabled &&
-       (gpu_feature_info
-            .status_values[gpu::GPU_FEATURE_TYPE_FLASH_STAGE3D_BASELINE] ==
-        gpu::kGpuFeatureStatusEnabled));
+  ppapi_prefs.is_3d_supported = false;
+  ppapi_prefs.is_stage3d_supported = false;
+  ppapi_prefs.is_stage3d_baseline_supported = false;
   ppapi_prefs.is_accelerated_video_decode_enabled =
       (prefs.accelerated_video_decode_enabled &&
        (gpu_feature_info

gpu/config/gpu_blocklist.cc

@@ -29,10 +29,6 @@ std::unique_ptr<GpuBlocklist> GpuBlocklist::Create(
                             GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS);
   list->AddSupportedFeature("accelerated_webgl",
                             GPU_FEATURE_TYPE_ACCELERATED_WEBGL);
-  list->AddSupportedFeature("flash3d", GPU_FEATURE_TYPE_FLASH3D);
-  list->AddSupportedFeature("flash_stage3d", GPU_FEATURE_TYPE_FLASH_STAGE3D);
-  list->AddSupportedFeature("flash_stage3d_baseline",
-                            GPU_FEATURE_TYPE_FLASH_STAGE3D_BASELINE);
   list->AddSupportedFeature("accelerated_video_decode",
                             GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE);
   list->AddSupportedFeature("gpu_rasterization",

gpu/config/gpu_blocklist_unittest.cc

@@ -87,13 +87,6 @@ GPU_BLOCKLIST_FEATURE_TEST(Accelerated2DCanvas,
 
 GPU_BLOCKLIST_FEATURE_TEST(AcceleratedWebGL, GPU_FEATURE_TYPE_ACCELERATED_WEBGL)
 
-GPU_BLOCKLIST_FEATURE_TEST(Flash3D, GPU_FEATURE_TYPE_FLASH3D)
-
-GPU_BLOCKLIST_FEATURE_TEST(FlashStage3D, GPU_FEATURE_TYPE_FLASH_STAGE3D)
-
-GPU_BLOCKLIST_FEATURE_TEST(FlashStage3DBaseline,
-                           GPU_FEATURE_TYPE_FLASH_STAGE3D_BASELINE)
-
 GPU_BLOCKLIST_FEATURE_TEST(AcceleratedVideoDecode,
                            GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE)
 

gpu/config/gpu_feature_type.h

@@ -13,10 +13,7 @@ namespace gpu {
 enum GpuFeatureType {
   GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS = 0,
   GPU_FEATURE_TYPE_ACCELERATED_WEBGL,
-  GPU_FEATURE_TYPE_FLASH3D,
-  GPU_FEATURE_TYPE_FLASH_STAGE3D,
   GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE,
-  GPU_FEATURE_TYPE_FLASH_STAGE3D_BASELINE,
   GPU_FEATURE_TYPE_GPU_RASTERIZATION,
   GPU_FEATURE_TYPE_ACCELERATED_WEBGL2,
   GPU_FEATURE_TYPE_PROTECTED_VIDEO_DECODE,

gpu/config/gpu_util.cc

@@ -267,46 +267,6 @@ GpuFeatureStatus Get2DCanvasFeatureStatus(
   return kGpuFeatureStatusEnabled;
 }
 
-GpuFeatureStatus GetFlash3DFeatureStatus(
-    const std::set<int>& blocklisted_features,
-    bool use_swift_shader) {
-  if (use_swift_shader) {
-    // This is for testing only. Chrome should exercise the GPU accelerated
-    // path on top of SwiftShader driver.
-    return kGpuFeatureStatusEnabled;
-  }
-  if (blocklisted_features.count(GPU_FEATURE_TYPE_FLASH3D))
-    return kGpuFeatureStatusBlocklisted;
-  return kGpuFeatureStatusEnabled;
-}
-
-GpuFeatureStatus GetFlashStage3DFeatureStatus(
-    const std::set<int>& blocklisted_features,
-    bool use_swift_shader) {
-  if (use_swift_shader) {
-    // This is for testing only. Chrome should exercise the GPU accelerated
-    // path on top of SwiftShader driver.
-    return kGpuFeatureStatusEnabled;
-  }
-  if (blocklisted_features.count(GPU_FEATURE_TYPE_FLASH_STAGE3D))
-    return kGpuFeatureStatusBlocklisted;
-  return kGpuFeatureStatusEnabled;
-}
-
-GpuFeatureStatus GetFlashStage3DBaselineFeatureStatus(
-    const std::set<int>& blocklisted_features,
-    bool use_swift_shader) {
-  if (use_swift_shader) {
-    // This is for testing only. Chrome should exercise the GPU accelerated
-    // path on top of SwiftShader driver.
-    return kGpuFeatureStatusEnabled;
-  }
-  if (blocklisted_features.count(GPU_FEATURE_TYPE_FLASH_STAGE3D) ||
-      blocklisted_features.count(GPU_FEATURE_TYPE_FLASH_STAGE3D_BASELINE))
-    return kGpuFeatureStatusBlocklisted;
-  return kGpuFeatureStatusEnabled;
-}
-
 GpuFeatureStatus GetAcceleratedVideoDecodeFeatureStatus(
     const std::set<int>& blocklisted_features,
     bool use_swift_shader) {
@@ -436,14 +396,8 @@ GpuFeatureInfo ComputeGpuFeatureInfoWithHardwareAccelerationDisabled() {
       kGpuFeatureStatusSoftware;
   gpu_feature_info.status_values[GPU_FEATURE_TYPE_ACCELERATED_WEBGL] =
       kGpuFeatureStatusSoftware;
-  gpu_feature_info.status_values[GPU_FEATURE_TYPE_FLASH3D] =
-      kGpuFeatureStatusDisabled;
-  gpu_feature_info.status_values[GPU_FEATURE_TYPE_FLASH_STAGE3D] =
-      kGpuFeatureStatusDisabled;
   gpu_feature_info.status_values[GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE] =
       kGpuFeatureStatusDisabled;
-  gpu_feature_info.status_values[GPU_FEATURE_TYPE_FLASH_STAGE3D_BASELINE] =
-      kGpuFeatureStatusDisabled;
   gpu_feature_info.status_values[GPU_FEATURE_TYPE_GPU_RASTERIZATION] =
       kGpuFeatureStatusDisabled;
   gpu_feature_info.status_values[GPU_FEATURE_TYPE_ACCELERATED_WEBGL2] =
@@ -474,14 +428,8 @@ GpuFeatureInfo ComputeGpuFeatureInfoWithNoGpu() {
       kGpuFeatureStatusSoftware;
   gpu_feature_info.status_values[GPU_FEATURE_TYPE_ACCELERATED_WEBGL] =
       kGpuFeatureStatusDisabled;
-  gpu_feature_info.status_values[GPU_FEATURE_TYPE_FLASH3D] =
-      kGpuFeatureStatusDisabled;
-  gpu_feature_info.status_values[GPU_FEATURE_TYPE_FLASH_STAGE3D] =
-      kGpuFeatureStatusDisabled;
   gpu_feature_info.status_values[GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE] =
       kGpuFeatureStatusDisabled;
-  gpu_feature_info.status_values[GPU_FEATURE_TYPE_FLASH_STAGE3D_BASELINE] =
-      kGpuFeatureStatusDisabled;
   gpu_feature_info.status_values[GPU_FEATURE_TYPE_GPU_RASTERIZATION] =
       kGpuFeatureStatusDisabled;
   gpu_feature_info.status_values[GPU_FEATURE_TYPE_ACCELERATED_WEBGL2] =
@@ -512,14 +460,8 @@ GpuFeatureInfo ComputeGpuFeatureInfoForSwiftShader() {
       kGpuFeatureStatusSoftware;
   gpu_feature_info.status_values[GPU_FEATURE_TYPE_ACCELERATED_WEBGL] =
       kGpuFeatureStatusSoftware;
-  gpu_feature_info.status_values[GPU_FEATURE_TYPE_FLASH3D] =
-      kGpuFeatureStatusDisabled;
-  gpu_feature_info.status_values[GPU_FEATURE_TYPE_FLASH_STAGE3D] =
-      kGpuFeatureStatusDisabled;
   gpu_feature_info.status_values[GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE] =
       kGpuFeatureStatusDisabled;
-  gpu_feature_info.status_values[GPU_FEATURE_TYPE_FLASH_STAGE3D_BASELINE] =
-      kGpuFeatureStatusDisabled;
   gpu_feature_info.status_values[GPU_FEATURE_TYPE_GPU_RASTERIZATION] =
       kGpuFeatureStatusDisabled;
   gpu_feature_info.status_values[GPU_FEATURE_TYPE_ACCELERATED_WEBGL2] =
@@ -601,13 +543,6 @@ GpuFeatureInfo ComputeGpuFeatureInfo(const GPUInfo& gpu_info,
       GetWebGL2FeatureStatus(blocklisted_features, use_swift_shader);
   gpu_feature_info.status_values[GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS] =
       Get2DCanvasFeatureStatus(blocklisted_features, use_swift_shader);
-  gpu_feature_info.status_values[GPU_FEATURE_TYPE_FLASH3D] =
-      GetFlash3DFeatureStatus(blocklisted_features, use_swift_shader);
-  gpu_feature_info.status_values[GPU_FEATURE_TYPE_FLASH_STAGE3D] =
-      GetFlashStage3DFeatureStatus(blocklisted_features, use_swift_shader);
-  gpu_feature_info.status_values[GPU_FEATURE_TYPE_FLASH_STAGE3D_BASELINE] =
-      GetFlashStage3DBaselineFeatureStatus(blocklisted_features,
-                                           use_swift_shader);
   gpu_feature_info.status_values[GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE] =
       GetAcceleratedVideoDecodeFeatureStatus(blocklisted_features,
                                              use_swift_shader);

gpu/config/software_rendering_list.json

@@ -13,8 +13,6 @@
       "multi_gpu_category": "any",
       "features": [
         "accelerated_webgl",
-        "flash3d",
-        "flash_stage3d",
         "gpu_rasterization"
       ]
     },
@@ -38,8 +36,6 @@
       "device_id": ["0x27AE", "0x27A2"],
       "features": [
         "accelerated_webgl",
-        "flash3d",
-        "flash_stage3d",
         "accelerated_2d_canvas"
       ]
     },
@@ -100,8 +96,6 @@
       "multi_gpu_category": "any",
       "features": [
         "accelerated_webgl",
-        "flash3d",
-        "flash_stage3d",
         "gpu_rasterization"
       ]
     },
@@ -357,16 +351,6 @@
         "all"
       ]
     },
-    {
-      "id": 53,
-      "description": "The Intel GMA500 is too slow for Stage3D",
-      "cr_bugs": [152096],
-      "vendor_id": "0x8086",
-      "device_id": ["0x8108", "0x8109"],
-      "features": [
-        "flash_stage3d"
-      ]
-    },
     {
       "id": 56,
       "description": "NVIDIA linux drivers are unstable when using multiple Open GL contexts and with low memory",
@@ -381,9 +365,7 @@
         "value": "331.38"
       },
       "features": [
-        "accelerated_video_decode",
-        "flash3d",
-        "flash_stage3d"
+        "accelerated_video_decode"
       ]
     },
     {
@@ -438,57 +420,6 @@
         "all"
       ]
     },
-    {
-      "id": 69,
-      "description": "NVIDIA driver 196.21 is buggy with Stage3D baseline mode",
-      "cr_bugs": [172771],
-      "os": {
-        "type": "win"
-      },
-      "vendor_id": "0x10de",
-      "driver_version": {
-        "comment": "INF_version: 8.17.11.9621; date: 01/11/2010",
-        "op": "=",
-        "value": "8.17.11.9621"
-      },
-      "features": [
-        "flash_stage3d_baseline"
-      ]
-    },
-    {
-      "id": 70,
-      "description": "NVIDIA driver 182.67 is buggy with Stage3D baseline mode",
-      "cr_bugs": [172771],
-      "os": {
-        "type": "win"
-      },
-      "vendor_id": "0x10de",
-      "driver_version": {
-        "comment": "INF_version: 7.15.11.8267; date: 05/12/2009",
-        "op": "=",
-        "value": "7.15.11.8267"
-      },
-      "features": [
-        "flash_stage3d_baseline"
-      ]
-    },
-    {
-      "id": 71,
-      "description": "All Intel drivers before 8.15.10.2021 are buggy with Stage3D baseline mode",
-      "cr_bugs": [172771],
-      "os": {
-        "type": "win"
-      },
-      "vendor_id": "0x8086",
-      "driver_version": {
-        "comment": "INF_version: 8.15.10.2021; date: 12/14/2009",
-        "op": "<",
-        "value": "8.15.10.2021"
-      },
-      "features": [
-        "flash_stage3d_baseline"
-      ]
-    },
     {
       "id": 72,
       "description": "NVIDIA GeForce 6200 LE is buggy with WebGL",
@@ -1639,8 +1570,6 @@
       },
       "features": [
         "accelerated_webgl",
-        "flash3d",
-        "flash_stage3d",
         "accelerated_2d_canvas"
       ]
     },
@@ -1658,8 +1587,6 @@
       },
       "features": [
         "accelerated_webgl",
-        "flash3d",
-        "flash_stage3d",
         "accelerated_2d_canvas"
       ]
     },

gpu/ipc/common/mojom_traits_unittest.cc

@@ -443,7 +443,7 @@ TEST_F(StructTraitsTest, GpuPreferences) {
 
 TEST_F(StructTraitsTest, GpuFeatureInfo) {
   GpuFeatureInfo input;
-  input.status_values[GPU_FEATURE_TYPE_FLASH3D] =
+  input.status_values[GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS] =
       gpu::kGpuFeatureStatusBlocklisted;
   input.status_values[GPU_FEATURE_TYPE_ACCELERATED_WEBGL] =
       gpu::kGpuFeatureStatusUndefined;