gpu/command_buffer/client/gles2_implementation.cc - Issue 235563002: gpu: Separate GpuControlService from GpuControl

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/gles2_implementation.cc

Issue 235563002: gpu: Separate GpuControlService from GpuControl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Remove MailboxManager Created 6 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

« no previous file with comments | « gpu/command_buffer/client/client_test_helper.h ('k') | gpu/command_buffer/client/gpu_control.h » ('j') | gpu/command_buffer/service/gles2_cmd_decoder.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gpu/command_buffer/client/gles2_implementation.cc

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

index 3fe999a05f7cd8530fc1636a00afcd516cf3aab1..ebe39da844ab5680d1737aafc64998f014fe16ef 100644

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

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

@@ -6,24 +6,24 @@

#include "gpu/command_buffer/client/gles2_implementation.h"

+#include <GLES2/gl2ext.h>

+#include <GLES2/gl2extchromium.h>

#include <algorithm>

+#include <limits>

#include <map>

#include <queue>

#include <set>

-#include <limits>

#include <sstream>

#include <string>

-#include <GLES2/gl2ext.h>

-#include <GLES2/gl2extchromium.h>

#include "base/bind.h"

#include "gpu/command_buffer/client/buffer_tracker.h"

+#include "gpu/command_buffer/client/gpu_control.h"

#include "gpu/command_buffer/client/gpu_memory_buffer_tracker.h"

#include "gpu/command_buffer/client/program_info_manager.h"

#include "gpu/command_buffer/client/query_tracker.h"

#include "gpu/command_buffer/client/transfer_buffer.h"

#include "gpu/command_buffer/client/vertex_array_object_manager.h"

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

-#include "gpu/command_buffer/common/gpu_control.h"

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

#include "ui/gfx/gpu_memory_buffer.h"

@@ -32,8 +32,8 @@

#endif

#if defined(GPU_CLIENT_DEBUG)

-#include "ui/gl/gl_switches.h"

#include "base/command_line.h"

+#include "ui/gl/gl_switches.h"

#endif

namespace gpu {