gpu/command_buffer/service/context_group.cc - Issue 10543125: gpu: Add support for GLX_EXT_texture_from_pixmap extension.

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

Issue 10543125: gpu: Add support for GLX_EXT_texture_from_pixmap extension. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Add kGLImplementationMockGL case to gl_image_android.cc. Created 8 years, 2 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:

Index: gpu/command_buffer/service/context_group.cc

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

index ecaf7006b082596656baba03af8725b7f4c9796d..3fe50adb120404cb8623b76e78ac11386f530bcc 100644

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

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

@@ -14,6 +14,7 @@

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

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

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

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

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

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

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

@@ -28,9 +29,11 @@ namespace gles2 {

ContextGroup::ContextGroup(

MailboxManager* mailbox_manager,

+ ImageManager* image_manager,

MemoryTracker* memory_tracker,

bool bind_generates_resource)

: mailbox_manager_(mailbox_manager ? mailbox_manager : new MailboxManager),

+ image_manager_(image_manager ? image_manager : new ImageManager),

memory_tracker_(memory_tracker),

num_contexts_(0),

enforce_gl_minimums_(CommandLine::ForCurrentProcess()->HasSwitch(