Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(434)

Unified Diff: gpu/tools/compositor_model_bench/compositor_model_bench.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: compile3 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/config/gpu_info_collector_unittest.cc ('k') | media/tools/player_x11/gl_video_renderer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/tools/compositor_model_bench/compositor_model_bench.cc
diff --git a/gpu/tools/compositor_model_bench/compositor_model_bench.cc b/gpu/tools/compositor_model_bench/compositor_model_bench.cc
index 44ce333bf679d65ef75c686b78956d2e670ab6e4..6c60382be355ee5b025d5336a827968e02fca3a8 100644
--- a/gpu/tools/compositor_model_bench/compositor_model_bench.cc
+++ b/gpu/tools/compositor_model_bench/compositor_model_bench.cc
@@ -31,11 +31,10 @@
#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/time/time.h"
-
#include "gpu/tools/compositor_model_bench/render_model_utils.h"
#include "gpu/tools/compositor_model_bench/render_models.h"
#include "gpu/tools/compositor_model_bench/render_tree.h"
-
+#include "ui/gl/gl_surface.h"
using base::TimeTicks;
using base::DirectoryExists;
@@ -186,8 +185,8 @@ class Simulator {
// Initialize the OpenGL context.
bool InitGLContext() {
- if (!InitializeStaticGLBindings(gfx::kGLImplementationDesktopGL)) {
- LOG(FATAL) << "InitializeStaticGLBindings failed";
+ if (!gfx::GLSurface::InitializeOneOff()) {
+ LOG(FATAL) << "gfx::GLSurface::InitializeOneOff failed";
return false;
}
« no previous file with comments | « gpu/config/gpu_info_collector_unittest.cc ('k') | media/tools/player_x11/gl_video_renderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698