diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-11-16 10:30:40 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-11-16 10:30:40 +0100 |
| commit | 8950f46d49f33767dc31770da517144e50fd27ff (patch) | |
| tree | 25cb5da93f50bf5d77e7d7de046d454ddd90e1be | |
| parent | 24d883d703d3599d6818b6b371ae06dd4ca6f734 (diff) | |
| parent | 5f4e77307b38e2f8155063e249a6c98802b9175f (diff) | |
Merge remote-tracking branch 'origin/5.12.0' into 5.12
Change-Id: Ie8d7348a1223ec92dfe06e579e0680c75012c260
| -rw-r--r-- | dist/changes-5.12.0 | 2 | ||||
| m--------- | src/3rdparty | 0 | ||||
| -rw-r--r-- | src/core/ozone/gl_ozone_glx_qt.cpp | 18 |
3 files changed, 5 insertions, 15 deletions
diff --git a/dist/changes-5.12.0 b/dist/changes-5.12.0 index 0302c3a8e..557bdf0a9 100644 --- a/dist/changes-5.12.0 +++ b/dist/changes-5.12.0 @@ -24,7 +24,7 @@ Chromium Snapshot ----------------- - Updated the Chromium version to 69.0.3497.128 -- Applied security fixes from Chrome up to version 70.0.3538.67 +- Applied security fixes from Chrome up to version 70.0.3538.102 Core library changes diff --git a/src/3rdparty b/src/3rdparty -Subproject 573ac8f40079aa4429fe734a7f1c7baef546c27 +Subproject 91432e048e9bef479cc61f97d6ab4599121a199 diff --git a/src/core/ozone/gl_ozone_glx_qt.cpp b/src/core/ozone/gl_ozone_glx_qt.cpp index 2e7a28a0e..e3a4f4708 100644 --- a/src/core/ozone/gl_ozone_glx_qt.cpp +++ b/src/core/ozone/gl_ozone_glx_qt.cpp @@ -44,18 +44,12 @@ #include <QGuiApplication> #include "gl_ozone_glx_qt.h" #include "gl_surface_glx_qt.h" +#include "gl_context_qt.h" #include "ui/gl/gl_context_glx.h" #include "ui/gl/gl_gl_api_implementation.h" #include "ui/gl/gl_glx_api_implementation.h" #include <dlfcn.h> -#ifndef QT_NO_OPENGL -#include <QOpenGLContext> -QT_BEGIN_NAMESPACE -Q_GUI_EXPORT QOpenGLContext *qt_gl_global_share_context(); -QT_END_NAMESPACE -#endif - namespace ui { bool GLOzoneGLXQt::InitializeGLOneOffPlatform() { @@ -79,16 +73,12 @@ bool GLOzoneGLXQt::InitializeStaticGLBindings( reinterpret_cast<gl::GLGetProcAddressProc>( base::GetFunctionPointerFromNativeLibrary(library, "glXGetProcAddress")); - -#ifndef QT_NO_OPENGL if (!get_proc_address) { // glx handle not loaded, fallback to qpa - if (QOpenGLContext *context = qt_gl_global_share_context()) { - get_proc_address = reinterpret_cast<gl::GLGetProcAddressProc>( - context->getProcAddress("glXGetProcAddress")); - } + QFunctionPointer address = GLContextHelper::getGlXGetProcAddress(); + get_proc_address = reinterpret_cast<gl::GLGetProcAddressProc>(address); } -#endif + if (!get_proc_address) { LOG(ERROR) << "glxGetProcAddress not found."; base::UnloadNativeLibrary(library); |