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

Unified Diff: ui/gl/init/gl_initializer_ozone.cc

Issue 2270463002: Add OzoneGLImpl interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. Created 4 years, 3 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/init/gl_factory_ozone.cc ('k') | ui/gl/init/ozone_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/init/gl_initializer_ozone.cc
diff --git a/ui/gl/init/gl_initializer_ozone.cc b/ui/gl/init/gl_initializer_ozone.cc
index fe43ed869e1f4d9bc51f30ef21cabc3f4b39c02a..ba6c335ac2e060acfd86735c0e6b8ab92648d37c 100644
--- a/ui/gl/init/gl_initializer_ozone.cc
+++ b/ui/gl/init/gl_initializer_ozone.cc
@@ -11,6 +11,7 @@
#include "ui/gl/gl_implementation_osmesa.h"
#include "ui/gl/gl_osmesa_api_implementation.h"
#include "ui/gl/gl_surface_egl.h"
+#include "ui/gl/init/ozone_util.h"
#include "ui/ozone/public/ozone_platform.h"
#include "ui/ozone/public/surface_factory_ozone.h"
@@ -19,12 +20,8 @@ namespace init {
namespace {
-ui::SurfaceFactoryOzone* GetSurfaceFactory() {
- return ui::OzonePlatform::GetInstance()->GetSurfaceFactoryOzone();
-}
-
bool InitializeStaticEGLInternal() {
- if (!GetSurfaceFactory()->LoadEGLGLES2Bindings())
+ if (!GetSurfaceFactoryOzone()->LoadEGLGLES2Bindings())
return false;
SetGLImplementation(kGLImplementationEGLGLES2);
@@ -37,10 +34,13 @@ bool InitializeStaticEGLInternal() {
} // namespace
bool InitializeGLOneOffPlatform() {
+ if (HasGLOzone())
+ return GetGLOzone()->InitializeGLOneOffPlatform();
+
switch (GetGLImplementation()) {
case kGLImplementationEGLGLES2:
if (!GLSurfaceEGL::InitializeOneOff(
- GetSurfaceFactory()->GetNativeDisplay())) {
+ GetSurfaceFactoryOzone()->GetNativeDisplay())) {
LOG(ERROR) << "GLSurfaceEGL::InitializeOneOff failed.";
return false;
}
@@ -58,7 +58,11 @@ bool InitializeStaticGLBindings(GLImplementation implementation) {
// unit tests have initialized with kGLImplementationMock, we don't want to
// later switch to another GL implementation.
DCHECK_EQ(kGLImplementationNone, GetGLImplementation());
- ui::OzonePlatform::InitializeForGPU();
+
+ if (HasGLOzone(implementation)) {
+ return GetGLOzone(implementation)
+ ->InitializeStaticGLBindings(implementation);
+ }
switch (implementation) {
case kGLImplementationOSMesaGL:
@@ -77,12 +81,22 @@ bool InitializeStaticGLBindings(GLImplementation implementation) {
}
void InitializeDebugGLBindings() {
+ if (HasGLOzone()) {
+ GetGLOzone()->InitializeDebugGLBindings();
+ return;
+ }
+
InitializeDebugGLBindingsEGL();
InitializeDebugGLBindingsGL();
InitializeDebugGLBindingsOSMESA();
}
void ClearGLBindingsPlatform() {
+ if (HasGLOzone()) {
+ GetGLOzone()->ClearGLBindings();
+ return;
+ }
+
ClearGLBindingsEGL();
ClearGLBindingsGL();
ClearGLBindingsOSMESA();
« no previous file with comments | « ui/gl/init/gl_factory_ozone.cc ('k') | ui/gl/init/ozone_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698