summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authorjbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-29 20:43:59 +0000
committerjbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-29 20:43:59 +0000
commit35da5ad84f06726841d29b0981fe13cf7b5ebcf2 (patch)
tree5a9ef5f4e90ec810227a5f8ab1c945ebe532f8c9 /gpu
parent6c37566f7d62477fb3c2d999d2c2994b8f59c487 (diff)
downloadchromium_src-35da5ad84f06726841d29b0981fe13cf7b5ebcf2.zip
chromium_src-35da5ad84f06726841d29b0981fe13cf7b5ebcf2.tar.gz
chromium_src-35da5ad84f06726841d29b0981fe13cf7b5ebcf2.tar.bz2
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
Diffstat (limited to 'gpu')
-rw-r--r--gpu/config/software_rendering_list_json.cc13
1 files changed, 12 insertions, 1 deletions
diff --git a/gpu/config/software_rendering_list_json.cc b/gpu/config/software_rendering_list_json.cc
index 230f76e..ce302c7 100644
--- a/gpu/config/software_rendering_list_json.cc
+++ b/gpu/config/software_rendering_list_json.cc
@@ -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"
+ ]
}
]
}