diff options
| author | jbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-12 03:45:54 +0000 |
|---|---|---|
| committer | jbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-12 03:45:54 +0000 |
| commit | 4abba3b4ecc67886716c98600e567725931276b4 (patch) | |
| tree | 7aaba976d7b8fcf5ae0232dea5cd230350aac2aa /content/browser/gpu | |
| parent | c910a241e1e5e4248d40f5cfbafcf695e62b883e (diff) | |
| download | chromium_src-4abba3b4ecc67886716c98600e567725931276b4.zip chromium_src-4abba3b4ecc67886716c98600e567725931276b4.tar.gz chromium_src-4abba3b4ecc67886716c98600e567725931276b4.tar.bz2 | |
Allow separately blacklisting Stage3D baseline mode.
Some older drivers should support Stage3D constrained mode, not baseline mode, so add blacklist entries for that.
BUG=172771
Review URL: https://chromiumcodereview.appspot.com/12079111
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181836 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/gpu')
| -rw-r--r-- | content/browser/gpu/gpu_blacklist.cc | 1 | ||||
| -rw-r--r-- | content/browser/gpu/gpu_internals_ui.cc | 9 | ||||
| -rw-r--r-- | content/browser/gpu/gpu_util.cc | 5 |
3 files changed, 15 insertions, 0 deletions
diff --git a/content/browser/gpu/gpu_blacklist.cc b/content/browser/gpu/gpu_blacklist.cc index b1cfcca..c4a28de 100644 --- a/content/browser/gpu/gpu_blacklist.cc +++ b/content/browser/gpu/gpu_blacklist.cc @@ -949,6 +949,7 @@ bool GpuBlacklist::GpuBlacklistEntry::SetBlacklistedFeatures( case GPU_FEATURE_TYPE_MULTISAMPLING: case GPU_FEATURE_TYPE_FLASH3D: case GPU_FEATURE_TYPE_FLASH_STAGE3D: + case GPU_FEATURE_TYPE_FLASH_STAGE3D_BASELINE: case GPU_FEATURE_TYPE_TEXTURE_SHARING: case GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE: case GPU_FEATURE_TYPE_3D_CSS: diff --git a/content/browser/gpu/gpu_internals_ui.cc b/content/browser/gpu/gpu_internals_ui.cc index 46000b7..d6541b5 100644 --- a/content/browser/gpu/gpu_internals_ui.cc +++ b/content/browser/gpu/gpu_internals_ui.cc @@ -269,6 +269,15 @@ Value* GetFeatureStatus() { false }, { + "flash_stage3d_baseline", + flags & (content::GPU_FEATURE_TYPE_FLASH_STAGE3D_BASELINE | + content::GPU_FEATURE_TYPE_FLASH_STAGE3D), + command_line.HasSwitch(switches::kDisableFlashStage3d), + "Using Stage3d Baseline profile in Flash has been disabled, either" + " via about:flags or command line.", + false + }, + { "texture_sharing", flags & GPU_FEATURE_TYPE_TEXTURE_SHARING, command_line.HasSwitch(switches::kDisableImageTransportSurface), diff --git a/content/browser/gpu/gpu_util.cc b/content/browser/gpu/gpu_util.cc index b013cad..7d7d932 100644 --- a/content/browser/gpu/gpu_util.cc +++ b/content/browser/gpu/gpu_util.cc @@ -24,6 +24,7 @@ const char kGpuFeatureNameWebgl[] = "webgl"; const char kGpuFeatureNameMultisampling[] = "multisampling"; const char kGpuFeatureNameFlash3d[] = "flash_3d"; const char kGpuFeatureNameFlashStage3d[] = "flash_stage3d"; +const char kGpuFeatureNameFlashStage3dBaseline[] = "flash_stage3d_baseline"; const char kGpuFeatureNameTextureSharing[] = "texture_sharing"; const char kGpuFeatureNameAcceleratedVideoDecode[] = "accelerated_video_decode"; const char kGpuFeatureName3dCss[] = "3d_css"; @@ -99,6 +100,8 @@ GpuFeatureType StringToGpuFeatureType(const std::string& feature_string) { return GPU_FEATURE_TYPE_FLASH3D; if (feature_string == kGpuFeatureNameFlashStage3d) return GPU_FEATURE_TYPE_FLASH_STAGE3D; + if (feature_string == kGpuFeatureNameFlashStage3dBaseline) + return GPU_FEATURE_TYPE_FLASH_STAGE3D_BASELINE; if (feature_string == kGpuFeatureNameTextureSharing) return GPU_FEATURE_TYPE_TEXTURE_SHARING; if (feature_string == kGpuFeatureNameAcceleratedVideoDecode) @@ -133,6 +136,8 @@ std::string GpuFeatureTypeToString(GpuFeatureType type) { matches.push_back(kGpuFeatureNameFlash3d); if (type & GPU_FEATURE_TYPE_FLASH_STAGE3D) matches.push_back(kGpuFeatureNameFlashStage3d); + if (type & GPU_FEATURE_TYPE_FLASH_STAGE3D_BASELINE) + matches.push_back(kGpuFeatureNameFlashStage3dBaseline); if (type & GPU_FEATURE_TYPE_TEXTURE_SHARING) matches.push_back(kGpuFeatureNameTextureSharing); if (type & GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE) |