diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-27 17:56:17 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-22 08:47:36 +0000 |
| commit | 5d0fbf8a6890c395c0cdc0c60e775b70c95e15ed (patch) | |
| tree | c6354b09515a9110c121e3a3f3e97dd94b9b788a /src/core/ozone/gl_surface_egl_qt.cpp | |
| parent | 43b7af20c421e4ffb20cd4625f3b704e78e7325d (diff) | |
General adaptations for Chromium 69
Change-Id: Ifeaf0ee13213dc5a24d2f2b4655cf7f405cddef7
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/ozone/gl_surface_egl_qt.cpp')
| -rw-r--r-- | src/core/ozone/gl_surface_egl_qt.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/core/ozone/gl_surface_egl_qt.cpp b/src/core/ozone/gl_surface_egl_qt.cpp index 37a801014..9fe5985ce 100644 --- a/src/core/ozone/gl_surface_egl_qt.cpp +++ b/src/core/ozone/gl_surface_egl_qt.cpp @@ -44,8 +44,8 @@ #include "gl_context_qt.h" #include "ozone/gl_surface_egl_qt.h" -#if !defined(OS_MACOSX) #include "ui/gl/gl_surface_egl.h" +#if !defined(OS_MACOSX) #include "ui/gl/egl_util.h" #include "ui/gl/init/gl_factory.h" @@ -302,6 +302,10 @@ void* GLSurfacelessQtEGL::GetShareHandle() return NULL; } +} // namespace gl +#endif // !defined(OS_MACOSX) + +namespace gl { std::string DriverEGL::GetPlatformExtensions() { EGLDisplay display = GLContextHelper::getEGLDisplay(); @@ -312,6 +316,4 @@ std::string DriverEGL::GetPlatformExtensions() const char* str = g_driver_egl.fn.eglQueryStringFn(display, EGL_EXTENSIONS); return str ? std::string(str) : ""; } - -} // namespace gl -#endif // !defined(OS_MACOSX) +} // namespace gl |