summaryrefslogtreecommitdiffstats
path: root/src/core/ozone
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2021-04-16 08:08:04 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2021-04-16 09:17:42 +0200
commitf45daad0c2156aec8d0fc095730b0e557c50f110 (patch)
treed12bfde007d2293c8feaa8618788f019d55e102f /src/core/ozone
parent027e7e574e7a4488d47cd4133e98d518210b1e56 (diff)
Fix the build after 88 adaptations
And clean up where -Qt and non Qt declarations are in the file. Change-Id: I152b548ee0fd81f3388fb20e86349e05ef401bfb Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'src/core/ozone')
-rw-r--r--src/core/ozone/gl_surface_glx_qt.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/core/ozone/gl_surface_glx_qt.cpp b/src/core/ozone/gl_surface_glx_qt.cpp
index 4f4bd1371..5ccf5037a 100644
--- a/src/core/ozone/gl_surface_glx_qt.cpp
+++ b/src/core/ozone/gl_surface_glx_qt.cpp
@@ -48,16 +48,8 @@
namespace gl {
-bool GLSurfaceGLXQt::s_initialized = false;
-
-GLSurfaceGLXQt::~GLSurfaceGLXQt()
-{
- Destroy();
-}
-
void GLSurfaceGLX::ShutdownOneOff()
{
- s_initialized = false;
}
bool GLSurfaceGLX::IsCreateContextSupported()
@@ -115,6 +107,20 @@ const char* GLSurfaceGLX::GetGLXExtensions()
return GLSurfaceQt::g_extensions;
}
+
+bool GLSurfaceGLXQt::s_initialized = false;
+
+GLSurfaceGLXQt::GLSurfaceGLXQt(const gfx::Size& size)
+ : GLSurfaceQt(size),
+ m_surfaceBuffer(0)
+{
+}
+
+GLSurfaceGLXQt::~GLSurfaceGLXQt()
+{
+ Destroy();
+}
+
bool GLSurfaceGLXQt::InitializeOneOff()
{
if (s_initialized)
@@ -197,12 +203,6 @@ void GLSurfaceGLXQt::Destroy()
}
}
-GLSurfaceGLXQt::GLSurfaceGLXQt(const gfx::Size& size)
- : GLSurfaceQt(size),
- m_surfaceBuffer(0)
-{
-}
-
void* GLSurfaceGLXQt::GetHandle()
{
return reinterpret_cast<void*>(m_surfaceBuffer);