diff options
| author | bartfab@chromium.org <bartfab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-25 12:13:08 +0000 |
|---|---|---|
| committer | bartfab@chromium.org <bartfab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-25 12:13:08 +0000 |
| commit | 25afcfe213ffd88f8e9370d4ff1ee23ecf9ae16c (patch) | |
| tree | 231cbf5a41324ba641db9c7af4913bf416c897e2 /ui/gl/gl_implementation_android.cc | |
| parent | 7d0cce0355811619fb78e00a1aaf0d04b103c98a (diff) | |
| download | chromium_src-25afcfe213ffd88f8e9370d4ff1ee23ecf9ae16c.zip chromium_src-25afcfe213ffd88f8e9370d4ff1ee23ecf9ae16c.tar.gz chromium_src-25afcfe213ffd88f8e9370d4ff1ee23ecf9ae16c.tar.bz2 | |
Revert 164047 - Make GL calls go through subclassable class.
Sheriff reverting as this CL added four static initializers.
BUG=155557
Review URL: https://chromiumcodereview.appspot.com/11266023
TBR=gman@chromium.org
Review URL: https://codereview.chromium.org/11270035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164051 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gl/gl_implementation_android.cc')
| -rw-r--r-- | ui/gl/gl_implementation_android.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/ui/gl/gl_implementation_android.cc b/ui/gl/gl_implementation_android.cc index 4dab47c..052f48f 100644 --- a/ui/gl/gl_implementation_android.cc +++ b/ui/gl/gl_implementation_android.cc @@ -9,10 +9,7 @@ #include "base/native_library.h" #include "base/path_service.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" namespace gfx { @@ -86,8 +83,8 @@ bool InitializeGLBindings(GLImplementation implementation) { // These two functions take single precision float rather than double // precision float parameters in GLES. - ::gfx::g_driver_gl.fn.glClearDepthFn = MarshalClearDepthToClearDepthf; - ::gfx::g_driver_gl.fn.glDepthRangeFn = MarshalDepthRangeToDepthRangef; + ::gfx::g_glClearDepth = MarshalClearDepthToClearDepthf; + ::gfx::g_glDepthRange = MarshalDepthRangeToDepthRangef; break; } case kGLImplementationMockGL: { |