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

Unified Diff: chrome/gpu/gpu_main.cc

Issue 2134006: Added EGL based GLContext.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 6 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 | « chrome/gpu/gpu_backing_store_glx_context.cc ('k') | chrome/gpu/gpu_video_layer_glx.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/gpu/gpu_main.cc
===================================================================
--- chrome/gpu/gpu_main.cc (revision 49195)
+++ chrome/gpu/gpu_main.cc (working copy)
@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "app/gfx/gl/gl_implementation.h"
#include "base/message_loop.h"
#include "build/build_config.h"
#include "chrome/common/chrome_constants.h"
@@ -17,9 +18,6 @@
#if defined(OS_WIN)
#include "app/win_util.h"
-#elif defined(GPU_USE_GLX)
-#include <dlfcn.h>
-#include <GL/glxew.h>
#endif
// Main function for starting the Gpu process.
@@ -41,8 +39,7 @@
#if defined(OS_WIN)
win_util::ScopedCOMInitializer com_initializer;
#elif defined(GPU_USE_GLX)
- dlopen("libGL.so.1", RTLD_LAZY | RTLD_GLOBAL);
- glxewInit();
+ gfx::InitializeGLBindings(gfx::kGLImplementationDesktopGL);
#endif
GpuProcess gpu_process;
« no previous file with comments | « chrome/gpu/gpu_backing_store_glx_context.cc ('k') | chrome/gpu/gpu_video_layer_glx.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698