0

Revert 231443 "Revert 231127 "Revert 230852 "Revert 230545 "Disa..."

> Revert 231127 "Revert 230852 "Revert 230545 "Disable image trans..."
> 
> BUG=311673, 304369
> 
> > Revert 230852 "Revert 230545 "Disable image transport surface on..."
> > 
> > > Revert 230545 "Disable image transport surface on all windows ma..."
> > > 
> > > Because the patch of r230660 got reverted.
> > > 
> > > > Disable image transport surface on all windows machines.
> > > > 
> > > > We want to try using the direct presentation path everywhere, so blacklist texture sharing on all machines. If this works, we can delete the image transport surface code later.
> > > > We've made the image transport surface work even with the sandbox at full strength, so remove the code that reduces the GPU sandbox in this case.
> > > > 
> > > > BUG=304369
> > > > R=kbr@chromium.org
> > > > 
> > > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=227583
> > > > 
> > > > Review URL: https://codereview.chromium.org/26073002
> > > 
> > > TBR=jbauman@chromium.org
> > > 
> > > Review URL: https://codereview.chromium.org/40723004
> > 
> > TBR=cpu@chromium.org
> > 
> > Review URL: https://codereview.chromium.org/45813002
> 
> TBR=jbauman@chromium.org
> 
> Review URL: https://codereview.chromium.org/50023002

TBR=jbauman@chromium.org

Review URL: https://codereview.chromium.org/50703007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231632 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
jbauman@chromium.org
2013-10-29 20:43:59 +00:00
parent 6c37566f7d
commit 35da5ad84f
2 changed files with 12 additions and 2 deletions

@ -685,7 +685,6 @@ void GpuDataManagerImplPrivate::AppendGpuCommandLine(
}
if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_TEXTURE_SHARING)) {
command_line->AppendSwitch(switches::kDisableImageTransportSurface);
reduce_sandbox = true;
}
if (gpu_driver_bugs_.find(gpu::DISABLE_D3D11) != gpu_driver_bugs_.end())
command_line->AppendSwitch(switches::kDisableD3D11);

@ -18,7 +18,7 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
{
"name": "software rendering list",
// Please update the version number whenever you change this file.
"version": "6.12",
"version": "6.13",
"entries": [
{
"id": 1,
@ -1153,6 +1153,17 @@ LONG_STRING_CONST(
"flash_stage3d",
"force_compositing_mode"
]
},
{
"id": 80,
"description": "Texture sharing should be disabled on all Windows machines",
"cr_bugs": [304369],
"os": {
"type": "win"
},
"features": [
"texture_sharing"
]
}
]
}