diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-10 17:05:54 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-11 23:23:45 +0000 |
| commit | 2037ec0fa70ed5a4909cf8afd38de6c4c1ae0860 (patch) | |
| tree | 0fb156c378b617c1049aee3b075016dd893027e7 | |
| parent | 7bb9e274bc017e87226145ea7159679d4b46f47e (diff) | |
Rename GLContextHelper::getXConfig() to getGlXConfig()
It returns a GLX specific configuration, not an X-specific.
Change-Id: Iecbb52b8d33c6f6f6471aec41082ecb49eaed416
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| -rw-r--r-- | src/core/ozone/gl_context_qt.cpp | 2 | ||||
| -rw-r--r-- | src/core/ozone/gl_context_qt.h | 2 | ||||
| -rw-r--r-- | src/core/ozone/gl_surface_glx_qt.cpp | 4 | ||||
| -rw-r--r-- | src/core/ozone/surface_factory_qt.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/core/ozone/gl_context_qt.cpp b/src/core/ozone/gl_context_qt.cpp index ad78b7d2b..1850380a2 100644 --- a/src/core/ozone/gl_context_qt.cpp +++ b/src/core/ozone/gl_context_qt.cpp @@ -112,7 +112,7 @@ void* GLContextHelper::getEGLConfig() return resourceForContext(resource); } -void* GLContextHelper::getXConfig() +void* GLContextHelper::getGlXConfig() { return resourceForContext(QByteArrayLiteral("glxconfig")); } diff --git a/src/core/ozone/gl_context_qt.h b/src/core/ozone/gl_context_qt.h index cecceabc9..59ee567aa 100644 --- a/src/core/ozone/gl_context_qt.h +++ b/src/core/ozone/gl_context_qt.h @@ -58,7 +58,7 @@ public: static bool initializeContext(gl::GLContext* context, gl::GLSurface* surface, gl::GLContextAttribs attribs); static void* getEGLConfig(); - static void* getXConfig(); + static void* getGlXConfig(); static void* getEGLDisplay(); static void* getXDisplay(); static void* getNativeDisplay(); diff --git a/src/core/ozone/gl_surface_glx_qt.cpp b/src/core/ozone/gl_surface_glx_qt.cpp index 32b85ff77..eebefa59b 100644 --- a/src/core/ozone/gl_surface_glx_qt.cpp +++ b/src/core/ozone/gl_surface_glx_qt.cpp @@ -124,9 +124,9 @@ bool GLSurfaceGLXQt::InitializeOneOff() return false; } - g_config = GLContextHelper::getXConfig(); + g_config = GLContextHelper::getGlXConfig(); if (!g_config) { - LOG(ERROR) << "GLContextHelper::getXConfig() failed."; + LOG(ERROR) << "GLContextHelper::getGlxConfig() failed."; return false; } diff --git a/src/core/ozone/surface_factory_qt.cpp b/src/core/ozone/surface_factory_qt.cpp index 3ceebeec1..9570852c9 100644 --- a/src/core/ozone/surface_factory_qt.cpp +++ b/src/core/ozone/surface_factory_qt.cpp @@ -59,7 +59,7 @@ SurfaceFactoryQt::SurfaceFactoryQt() { Q_ASSERT(qApp); #if QT_CONFIG(webengine_system_x11) - if (GLContextHelper::getXConfig()) { + if (GLContextHelper::getGlXConfig()) { m_impl = gl::kGLImplementationDesktopGL; m_ozone.reset(new ui::GLOzoneGLXQt()); } else |