diff options
| author | hubbe@chromium.org <hubbe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-04 06:16:46 +0000 |
|---|---|---|
| committer | hubbe@chromium.org <hubbe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-04 06:16:46 +0000 |
| commit | 4cbc65228c4ae606518a4223c47865dbb8c2d210 (patch) | |
| tree | ba447149933a7284921fa34b178b8060eb1ff377 /cc/output/gl_renderer.h | |
| parent | 14263fe6425f8078770836253747a0af5381cba0 (diff) | |
| download | chromium_src-4cbc65228c4ae606518a4223c47865dbb8c2d210.zip chromium_src-4cbc65228c4ae606518a4223c47865dbb8c2d210.tar.gz chromium_src-4cbc65228c4ae606518a4223c47865dbb8c2d210.tar.bz2 | |
Perform glReadPixels with PBOs in the gpu, if PBOs are available.
Make GL_ASYNC_READ_PIXELS_COMPLETED_CHROMIUM wait for readpixel transfers.
PLEASE NOTE: glMapBuffer does not wait for the readpixels transfer to complete anymore.
Nobody is currently relying on that behaviour.
Update gl_helper.cc and gl_renderer.cc to use queries.
This CL is the same as https://codereview.chromium.org/16831004/
but includes fixes for:
OutOfProcessPPAPITests.Graphics3D (removed a check in query_tracker.cc)
GLReadbackTest.ReadPixelsWithPBO (removed, no longer a valid test)
GLReadbackTest.ReadPixelsWithPBOAndQuery (now uses the correct query)
BUG=249925
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=209873
Review URL: https://chromiumcodereview.appspot.com/18555006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210138 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/output/gl_renderer.h')
| -rw-r--r-- | cc/output/gl_renderer.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cc/output/gl_renderer.h b/cc/output/gl_renderer.h index eb4be68..d58a702 100644 --- a/cc/output/gl_renderer.h +++ b/cc/output/gl_renderer.h @@ -202,6 +202,7 @@ class CC_EXPORT GLRenderer : public DirectRenderer { void FinishedReadback( const AsyncGetFramebufferPixelsCleanupCallback& cleanup_callback, unsigned source_buffer, + unsigned query, uint8_t* dest_pixels, gfx::Size size); void PassOnSkBitmap(scoped_ptr<SkBitmap> bitmap, |