summaryrefslogtreecommitdiffstats
path: root/cc/test/test_web_graphics_context_3d.cc
diff options
context:
space:
mode:
authorhubbe@chromium.org <hubbe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-03 03:57:04 +0000
committerhubbe@chromium.org <hubbe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-03 03:57:04 +0000
commitfe04ab39c96f98362d73526d7bdaade9fe85f5ff (patch)
tree865cf43f978a1f241c16401084314cc7b379ca35 /cc/test/test_web_graphics_context_3d.cc
parent853c9a891eacc30d4b0d19b6228516e1164499af (diff)
downloadchromium_src-fe04ab39c96f98362d73526d7bdaade9fe85f5ff.zip
chromium_src-fe04ab39c96f98362d73526d7bdaade9fe85f5ff.tar.gz
chromium_src-fe04ab39c96f98362d73526d7bdaade9fe85f5ff.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/, which was submitted and reverted because it seemed to cause OutOfProcessPPAPITest.Graphics3D failures on XP. Since I don't have an XP box and there are no XP trybots I can't seem to reproduce the problem. Also, this particular test is flaky and has had problems even after my CL was reverted. Thus, I'm going to try to submit it again, and if that breaks OutOfProcessPPAPITest.Graphics3D again, I apologize in advance. BUG=249925 Review URL: https://chromiumcodereview.appspot.com/18555006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209873 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/test_web_graphics_context_3d.cc')
-rw-r--r--cc/test/test_web_graphics_context_3d.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/cc/test/test_web_graphics_context_3d.cc b/cc/test/test_web_graphics_context_3d.cc
index f5ebb6b..3ea9379 100644
--- a/cc/test/test_web_graphics_context_3d.cc
+++ b/cc/test/test_web_graphics_context_3d.cc
@@ -364,6 +364,12 @@ void TestWebGraphicsContext3D::signalSyncPoint(
sync_point_callbacks_.push_back(callback);
}
+void TestWebGraphicsContext3D::signalQuery(
+ WebKit::WebGLId query,
+ WebGraphicsSyncPointCallback* callback) {
+ sync_point_callbacks_.push_back(callback);
+}
+
void TestWebGraphicsContext3D::setSwapBuffersCompleteCallbackCHROMIUM(
WebGraphicsSwapBuffersCompleteCallbackCHROMIUM* callback) {
if (support_swapbuffers_complete_callback_)