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

Unified Diff: ui/gl/gl_implementation_win.cc

Issue 11266023: Make GL calls go through subclassable class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gl/gl_implementation_mac.cc ('k') | ui/gl/gl_osmesa_api_implementation.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_implementation_win.cc
diff --git a/ui/gl/gl_implementation_win.cc b/ui/gl/gl_implementation_win.cc
index eaec391b145afbb040fe01f161af0dd5808c7d37..ac1e3bf4c58f64ff92c0dba86ed32828a3f7e91a 100644
--- a/ui/gl/gl_implementation_win.cc
+++ b/ui/gl/gl_implementation_win.cc
@@ -15,7 +15,11 @@
#include "base/stringprintf.h"
#include "base/threading/thread_restrictions.h"
#include "ui/gl/gl_bindings.h"
+#include "ui/gl/gl_egl_api_implementation.h"
+#include "ui/gl/gl_gl_api_implementation.h"
#include "ui/gl/gl_implementation.h"
+#include "ui/gl/gl_osmesa_api_implementation.h"
+#include "ui/gl/gl_wgl_api_implementation.h"
#if defined(ENABLE_SWIFTSHADER)
#include "software_renderer.h"
@@ -24,6 +28,7 @@
namespace gfx {
namespace {
+
// This is the D3DX_SDK_VERSION for the last 'separate' DirectX SDK which
// is from June 2010. Since June 2012 Microsoft includes DirectX in the regular
// Windows SDK and the D3DX library has been deprecated.
@@ -181,8 +186,8 @@ bool InitializeGLBindings(GLImplementation implementation) {
// These two functions take single precision float rather than double
// precision float parameters in GLES.
- ::gfx::g_glClearDepth = MarshalClearDepthToClearDepthf;
- ::gfx::g_glDepthRange = MarshalDepthRangeToDepthRangef;
+ ::gfx::g_driver_gl.fn.glClearDepthFn = MarshalClearDepthToClearDepthf;
+ ::gfx::g_driver_gl.fn.glDepthRangeFn = MarshalDepthRangeToDepthRangef;
break;
}
case kGLImplementationDesktopGL: {
« no previous file with comments | « ui/gl/gl_implementation_mac.cc ('k') | ui/gl/gl_osmesa_api_implementation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698