diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-11-01 16:26:27 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-11-01 16:26:27 +0100 |
| commit | 06a04f4acbde2f6ae966c450014102120b887d6a (patch) | |
| tree | fade383f40bdfef720b6a7c38dc36e3533f4cdcb /src/core/ozone/gl_surface_qt.cpp | |
| parent | 6c736295cf1ead52f7f4ca99138d678573dab03c (diff) | |
| parent | 4cf520d67f0619330bbf53a743818924d476d95f (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ib09a8e88efb06413bb8f39e30f1360ce70b04b24
Diffstat (limited to 'src/core/ozone/gl_surface_qt.cpp')
| -rw-r--r-- | src/core/ozone/gl_surface_qt.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/ozone/gl_surface_qt.cpp b/src/core/ozone/gl_surface_qt.cpp index 58a225b4e..e9da5e6a5 100644 --- a/src/core/ozone/gl_surface_qt.cpp +++ b/src/core/ozone/gl_surface_qt.cpp @@ -140,7 +140,7 @@ bool InitializeGLOneOffPlatform() { VSyncProviderWin::InitializeOneOff(); - if (GetGLImplementation() == kGLImplementationEGLGLES2) + if (GetGLImplementation() == kGLImplementationEGLGLES2 || GetGLImplementation() == kGLImplementationEGLANGLE) return GLSurfaceEGLQt::InitializeOneOff(); if (GetGLImplementation() == kGLImplementationDesktopGL) { @@ -173,6 +173,7 @@ CreateOffscreenGLSurfaceWithFormat(const gfx::Size& size, GLSurfaceFormat format return surface; break; } + case kGLImplementationEGLANGLE: case kGLImplementationEGLGLES2: { surface = new GLSurfaceEGLQt(size); if (surface->Initialize(format)) |