summaryrefslogtreecommitdiffstats
path: root/chrome/tab_capture_end2end_tests.isolate
diff options
context:
space:
mode:
authormiu <miu@chromium.org>2014-11-10 17:35:41 -0800
committerCommit bot <commit-bot@chromium.org>2014-11-11 01:37:00 +0000
commit50cef609bfd4cd9d6df305367af2b4ef0e7b511c (patch)
tree6d3c11c1e00f2cb2284328e80f3cad7c9f24483c /chrome/tab_capture_end2end_tests.isolate
parent8e27ee01469c947ccb5d79ae4e1941f5a7fd872b (diff)
downloadchromium_src-50cef609bfd4cd9d6df305367af2b4ef0e7b511c.zip
chromium_src-50cef609bfd4cd9d6df305367af2b4ef0e7b511c.tar.gz
chromium_src-50cef609bfd4cd9d6df305367af2b4ef0e7b511c.tar.bz2
Add GL_APPLE_fence support, enabling asynchronous glReadPixels for Mac.
With the removal of the CompositingIOSurface code a few months back, all the support for using APPLE fences to support asynchronous GPU readback was deleted along with it. While the current GPU readback code path does support asynchronous glReadPixels operations, it is disabled on Mac for lack of fence support. This change adds back the necessary fence support. This change should be safe, given that the pre-Mountain Lion blacklist item, disable_async_readpixels, is still in-place; and so we will retain synchronous readback behavior on systems with known buggy drivers. BUG=430586 Review URL: https://codereview.chromium.org/701103003 Cr-Commit-Position: refs/heads/master@{#303567}
Diffstat (limited to 'chrome/tab_capture_end2end_tests.isolate')
-rw-r--r--chrome/tab_capture_end2end_tests.isolate3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/tab_capture_end2end_tests.isolate b/chrome/tab_capture_end2end_tests.isolate
index 5f686e0..36412cf 100644
--- a/chrome/tab_capture_end2end_tests.isolate
+++ b/chrome/tab_capture_end2end_tests.isolate
@@ -14,9 +14,10 @@
'--test-launcher-bot-mode',
'--enable-gpu',
'--test-launcher-jobs=1',
- '--gtest_filter=TabCaptureApiPixelTest.EndToEnd*',
+ '--gtest_filter=CastStreamingApiTestWithPixelOutput.EndToEnd*:TabCaptureApiPixelTest.EndToEnd*',
],
'files': [
+ 'test/data/extensions/api_test/cast_streaming/',
'test/data/extensions/api_test/tab_capture/',
],
},