gpu/command_buffer/client/query_tracker.cc - Issue 19579008: Revert "Revert 210138 "Perform glReadPixels with PBOs in the gpu, if PBO...""

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: gpu/command_buffer/client/query_tracker.cc

Issue 19579008: Revert "Revert 210138 "Perform glReadPixels with PBOs in the gpu, if PBO..."" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: previous upload reverts the revert, here are the changes Created 7 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « gpu/command_buffer/client/gles2_implementation_unittest.cc ('k') | gpu/command_buffer/common/gles2_cmd_format_autogen.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gpu/command_buffer/client/query_tracker.cc

diff --git a/gpu/command_buffer/client/query_tracker.cc b/gpu/command_buffer/client/query_tracker.cc

index 7cdc7fd8a223f09ceceb4debb6ffdf56b4f292fb..35732bf4a83b78c7b91b482592d0a1000acd4b00 100644

--- a/gpu/command_buffer/client/query_tracker.cc

+++ b/gpu/command_buffer/client/query_tracker.cc

@@ -113,9 +113,7 @@ void QueryTracker::Query::Begin(GLES2Implementation* gl) {

gl->helper()->BeginQueryEXT(target(), id(), shm_id(), shm_offset());

break;

case GL_ASYNC_PIXEL_TRANSFERS_COMPLETED_CHROMIUM:

- // tell service about id, shared memory and count

- gl->helper()->BeginQueryEXT(target(), id(), shm_id(), shm_offset());

- break;

+ case GL_ASYNC_READ_PIXELS_COMPLETED_CHROMIUM:

default:

// tell service about id, shared memory and count

gl->helper()->BeginQueryEXT(target(), id(), shm_id(), shm_offset());

@@ -165,8 +163,7 @@ bool QueryTracker::Query::CheckResultsAvailable(

static_cast<uint64>(0xFFFFFFFFL));

break;

case GL_ASYNC_PIXEL_TRANSFERS_COMPLETED_CHROMIUM:

- result_ = info_.sync->result;

- break;

+ case GL_ASYNC_READ_PIXELS_COMPLETED_CHROMIUM:

default:

result_ = info_.sync->result;

break;

« no previous file with comments | « gpu/command_buffer/client/gles2_implementation_unittest.cc ('k') | gpu/command_buffer/common/gles2_cmd_format_autogen.h » ('j') | no next file with comments »