gpu/command_buffer/service/query_manager.cc - Issue 14308014: Clean up of GLES2 Command Decoder by moving some of the error state into a separate class.

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/service/query_manager.cc

Issue 14308014: Clean up of GLES2 Command Decoder by moving some of the error state into a separate class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix merge error. Created 7 years, 8 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

Index: gpu/command_buffer/service/query_manager.cc

diff --git a/gpu/command_buffer/service/query_manager.cc b/gpu/command_buffer/service/query_manager.cc

index 198ab5a3e2ea7c0b2c7a5dfb0b138f8342bc607e..7b4123276e50280743e413e76db6c44957efbb5e 100644

--- a/gpu/command_buffer/service/query_manager.cc

+++ b/gpu/command_buffer/service/query_manager.cc

@@ -10,6 +10,7 @@

#include "base/shared_memory.h"

#include "base/time.h"

#include "gpu/command_buffer/common/gles2_cmd_format.h"

+#include "gpu/command_buffer/service/error_state.h"

#include "gpu/command_buffer/service/feature_info.h"

#include "gpu/command_buffer/service/gles2_cmd_decoder.h"

#include "ui/gl/async_pixel_transfer_delegate.h"

@@ -280,7 +281,7 @@ bool GetErrorQuery::Begin() {

bool GetErrorQuery::End(uint32 submit_count) {

MarkAsPending(submit_count);

- return MarkAsCompleted(manager()->decoder()->GetGLError());

+ return MarkAsCompleted(manager()->decoder()->GetErrorState()->GetGLError());

}

bool GetErrorQuery::Process() {

« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder_mock.h ('k') | gpu/command_buffer/service/query_manager_unittest.cc » ('j') | no next file with comments »