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

Unified Diff: chrome/gpu/gpu_main.cc

Issue 4107001: Upgraded Mesa to 7.9 from 7.7 in order to pick up bug fixes to the... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/mesa/MesaLib/include/GL/gl.h » ('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 63788)
+++ 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/app_switches.h"
#include "app/gfx/gl/gl_implementation.h"
#include "base/message_loop.h"
#include "build/build_config.h"
@@ -66,7 +67,9 @@
#if defined(OS_WIN)
win_util::ScopedCOMInitializer com_initializer;
#elif defined(GPU_USE_GLX)
- gfx::InitializeGLBindings(gfx::kGLImplementationDesktopGL);
+ if (!command_line.HasSwitch(switches::kUseGL)) {
+ gfx::InitializeGLBindings(gfx::kGLImplementationDesktopGL);
+ }
#endif
GpuProcess gpu_process;
« no previous file with comments | « no previous file | third_party/mesa/MesaLib/include/GL/gl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698