diff options
| author | hubbe@chromium.org <hubbe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-23 23:17:55 +0000 |
|---|---|---|
| committer | hubbe@chromium.org <hubbe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-23 23:17:55 +0000 |
| commit | 5a36dc13089e6cf21e7cae9763d08025e78e4cdb (patch) | |
| tree | fdbf76ac3898592f055c2703dbdc2e4b36651320 /cc/test/test_web_graphics_context_3d.h | |
| parent | b22c8af6b13fb76a84cc61c714e699fbbb7d2918 (diff) | |
| download | chromium_src-5a36dc13089e6cf21e7cae9763d08025e78e4cdb.zip chromium_src-5a36dc13089e6cf21e7cae9763d08025e78e4cdb.tar.gz chromium_src-5a36dc13089e6cf21e7cae9763d08025e78e4cdb.tar.bz2 | |
Revert "Revert 210138 "Perform glReadPixels with PBOs in the gpu, if PBO...""
Third try for getting asynchrous readpixels to work everywhere.
This is identical to: https://codereview.chromium.org/16831004/, but with the following fixes:
OutOfProcessPPAPITests.Graphics3D (removed a check in query_tracker.cc)
GLReadbackTest.ReadPixelsWithPBO (removed, no longer a valid test)
GLReadbackTest.ReadPixelsWithPBOAndQuery (now uses the correct query)
And, new in this CL:
Disable asynchronous readpixels on macosx prior to 10.8, as it would seem
that the GL_ARB_fence extension doesn't seem to work on any driver, and
there are crashes in readpixel itself on intel drivers. The original
CL only disabled the async readpixels path for intel drivers.
BUG=258169
Review URL: https://chromiumcodereview.appspot.com/19579008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213261 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/test_web_graphics_context_3d.h')
| -rw-r--r-- | cc/test/test_web_graphics_context_3d.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cc/test/test_web_graphics_context_3d.h b/cc/test/test_web_graphics_context_3d.h index 41296b2..b182fe6 100644 --- a/cc/test/test_web_graphics_context_3d.h +++ b/cc/test/test_web_graphics_context_3d.h @@ -114,6 +114,8 @@ class TestWebGraphicsContext3D : public FakeWebGraphicsContext3D { // Takes ownership of the |callback|. virtual void signalSyncPoint(unsigned sync_point, WebGraphicsSyncPointCallback* callback); + virtual void signalQuery(WebKit::WebGLId query, + WebGraphicsSyncPointCallback* callback); virtual void setSwapBuffersCompleteCallbackCHROMIUM( WebGraphicsSwapBuffersCompleteCallbackCHROMIUM* callback); |