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

Unified Diff: ui/gl/gl_implementation_ozone.cc

Issue 2094513002: Move static GL binding initialization to //ui/gl/init. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix for comment. Created 4 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 | « ui/gl/gl_implementation_osmesa.h ('k') | ui/gl/gl_implementation_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_implementation_ozone.cc
diff --git a/ui/gl/gl_implementation_ozone.cc b/ui/gl/gl_implementation_ozone.cc
index 67812bb8ceb16ab4a02c74bc13611a61d93a491b..2564c1a5b49e16ec20a7c926e658c8ac2e92c98c 100644
--- a/ui/gl/gl_implementation_ozone.cc
+++ b/ui/gl/gl_implementation_ozone.cc
@@ -2,76 +2,21 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/bind.h"
-#include "ui/gl/gl_bindings.h"
+#include "ui/gl/gl_implementation.h"
+
#include "ui/gl/gl_context_stub_with_extensions.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_implementation_osmesa.h"
#include "ui/gl/gl_osmesa_api_implementation.h"
-#include "ui/ozone/public/ozone_platform.h"
-#include "ui/ozone/public/surface_factory_ozone.h"
namespace gl {
-namespace {
-
-void GL_BINDING_CALL MarshalClearDepthToClearDepthf(GLclampd depth) {
- glClearDepthf(static_cast<GLclampf>(depth));
-}
-
-void GL_BINDING_CALL MarshalDepthRangeToDepthRangef(GLclampd z_near,
- GLclampd z_far) {
- glDepthRangef(static_cast<GLclampf>(z_near), static_cast<GLclampf>(z_far));
-}
-
-} // namespace
-
void GetAllowedGLImplementations(std::vector<GLImplementation>* impls) {
impls->push_back(kGLImplementationEGLGLES2);
impls->push_back(kGLImplementationOSMesaGL);
}
-bool InitializeStaticGLBindings(GLImplementation implementation) {
- // Prevent reinitialization with a different implementation. Once the gpu
- // unit tests have initialized with kGLImplementationMock, we don't want to
- // later switch to another GL implementation.
- DCHECK_EQ(kGLImplementationNone, GetGLImplementation());
- ui::OzonePlatform::InitializeForGPU();
-
- switch (implementation) {
- case kGLImplementationOSMesaGL:
- return InitializeStaticGLBindingsOSMesaGL();
- case kGLImplementationEGLGLES2:
- if (!ui::OzonePlatform::GetInstance()
- ->GetSurfaceFactoryOzone()
- ->LoadEGLGLES2Bindings(base::Bind(&AddGLNativeLibrary),
- base::Bind(&SetGLGetProcAddressProc)))
- return false;
- SetGLImplementation(kGLImplementationEGLGLES2);
- InitializeStaticGLBindingsGL();
- InitializeStaticGLBindingsEGL();
-
- // These two functions take single precision float rather than double
- // precision float parameters in GLES.
- ::gl::g_driver_gl.fn.glClearDepthFn = MarshalClearDepthToClearDepthf;
- ::gl::g_driver_gl.fn.glDepthRangeFn = MarshalDepthRangeToDepthRangef;
- break;
- case kGLImplementationMockGL: {
- SetGLImplementation(kGLImplementationMockGL);
- InitializeStaticGLBindingsGL();
- break;
- }
- default:
- NOTIMPLEMENTED()
- << "Unsupported GL type for Ozone surface implementation";
- return false;
- }
-
- return true;
-}
-
bool InitializeDynamicGLBindings(GLImplementation implementation,
GLContext* context) {
switch (implementation) {
@@ -96,20 +41,6 @@ bool InitializeDynamicGLBindings(GLImplementation implementation,
return true;
}
-void InitializeDebugGLBindings() {
- InitializeDebugGLBindingsEGL();
- InitializeDebugGLBindingsGL();
- InitializeDebugGLBindingsOSMESA();
-}
-
-void ClearGLBindings() {
- ClearGLBindingsEGL();
- ClearGLBindingsGL();
- ClearGLBindingsOSMESA();
- SetGLImplementation(kGLImplementationNone);
- UnloadGLNativeLibraries();
-}
-
bool GetGLWindowSystemBindingInfo(GLWindowSystemBindingInfo* info) {
switch (GetGLImplementation()) {
case kGLImplementationEGLGLES2:
« no previous file with comments | « ui/gl/gl_implementation_osmesa.h ('k') | ui/gl/gl_implementation_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698