From 009fcb260f64800b183ecb2796baaa1e918bc572 Mon Sep 17 00:00:00 2001 From: "zmo@chromium.org" Date: Tue, 19 Nov 2013 23:25:23 +0000 Subject: Consolidate texture_sharing and accelerated_compositing in gpu blacklist. 1) disable texture_sharing in win in general and remove all more detailed entries 2) replace all accelerated_compositing with "all" BUG=315215,315217 TEST=tree R=kbr@chromium.org Review URL: https://codereview.chromium.org/76483003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236068 0039d316-1c4b-4281-b951-d872f2087c98 --- gpu/config/software_rendering_list_json.cc | 38 ++++-------------------------- 1 file changed, 5 insertions(+), 33 deletions(-) (limited to 'gpu') diff --git a/gpu/config/software_rendering_list_json.cc b/gpu/config/software_rendering_list_json.cc index 502f250..ae3f014 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.14", + "version": "6.15", "entries": [ { "id": 1, @@ -37,8 +37,8 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST( }, { "id": 3, - "description": "GL driver is software rendered. Accelerated compositing is disabled.", - "cr_bugs": [59302], + "description": "GL driver is software rendered. GPU acceleration is disabled.", + "cr_bugs": [59302, 315217], "os": { "type": "linux" }, @@ -47,7 +47,7 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST( "value": "software" }, "features": [ - "accelerated_compositing" + "all" ] }, { @@ -467,22 +467,6 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST( ] }, { - "id": 43, - "description": "Intel driver version 8.15.10.1749 has problems sharing textures.", - "cr_bugs": [133924], - "os": { - "type": "win" - }, - "vendor_id": "0x8086", - "driver_version": { - "op": "=", - "value": "8.15.10.1749" - }, - "features": [ - "texture_sharing" - ] - }, - { "id": 44, "description": "Intel HD 4000 causes kernel panic on Lion.", "cr_bugs": [134015], @@ -919,18 +903,6 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST( ) // String split to avoid MSVC char limit. LONG_STRING_CONST( { - "id": 75, - "description": "Texture sharing not supported on AMD Switchable GPUs due to driver issues", - "cr_bugs": [117371], - "os": { - "type": "win" - }, - "multi_gpu_style": "amd_switchable", - "features": [ - "texture_sharing" - ] - }, - { "id": 76, "description": "WebGL is disabled on Android unless GPU reset notification is supported", "os": { @@ -991,7 +963,7 @@ LONG_STRING_CONST( { "id": 80, "description": "Texture sharing should be disabled on all Windows machines", - "cr_bugs": [304369], + "cr_bugs": [304369, 315215], "os": { "type": "win" }, -- cgit v1.1