media/tools/player_x11/gl_video_renderer.cc - Issue 135213003: Ensure GL initialization only happens once, and provide common init path

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: media/tools/player_x11/gl_video_renderer.cc

Issue 135213003: Ensure GL initialization only happens once, and provide common init path (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: initgl: Created 6 years, 11 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/tools/compositor_model_bench/compositor_model_bench.cc ('k') | ui/compositor/test/context_factories_for_test.cc » ('j') | ui/compositor/test/default_context_factory.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/tools/player_x11/gl_video_renderer.cc

diff --git a/media/tools/player_x11/gl_video_renderer.cc b/media/tools/player_x11/gl_video_renderer.cc

index 58d122a0d66cf9f6306b6359a57d14e274bec1c7..6ccfd27deb7331b0357a5da40ccae7500e9ba842 100644

--- a/media/tools/player_x11/gl_video_renderer.cc

+++ b/media/tools/player_x11/gl_video_renderer.cc

@@ -20,8 +20,8 @@ static GLXContext InitGLContext(Display* display, Window window) {

// dlopen/dlsym, and so linking it into chrome breaks it. So we dynamically

// load it, and use glew to dynamically resolve symbols.

// See http://code.google.com/p/chromium/issues/detail?id=16800

- if (!InitializeStaticGLBindings(gfx::kGLImplementationDesktopGL)) {

- LOG(ERROR) << "InitializeStaticGLBindings failed";

+ if (!gfx::GLSurface::InitializeOneOff()) {

+ LOG(ERROR) << "GLSurface::InitializeOneOff failed";

return NULL;

}