summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErik Larsson <erik@ortogonal.com>2016-03-02 06:42:04 +0100
committerErik Larsson <erik@ortogonal.com>2016-03-02 08:26:38 +0000
commit91abe5a2abbb6a19dc37e8d2047d44473c37d6cb (patch)
tree5086d13c1636d7ea2aeb9f650c022a19e7e1cc00
parent1edfb6651b4433fe0b0681eb40f1472757640dda (diff)
Use getProcAddress(const char*) to work with updates in QOpenGLContext
QOpenGLContext changed the getProcAddress overload to use const char* instead of QByteArray in commit (qtbase 29d8159c4478a5275d2ea102daf270a91ed7e92e). Change-Id: Idce613ebd06daeb111fd76ebee89a82182d028d5 Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
-rw-r--r--src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.cpp4
-rw-r--r--src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.h2
-rw-r--r--src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp4
-rw-r--r--src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h2
-rw-r--r--src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.cpp4
-rw-r--r--src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h2
6 files changed, 9 insertions, 9 deletions
diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.cpp b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.cpp
index 9fcd7b2f..a14f6b02 100644
--- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.cpp
+++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.cpp
@@ -92,9 +92,9 @@ void QWaylandBrcmGLContext::swapBuffers(QPlatformSurface *surface)
static_cast<QWaylandBrcmEglWindow *>(surface)->swapBuffers();
}
-void (*QWaylandBrcmGLContext::getProcAddress(const QByteArray &procName)) ()
+void (*QWaylandBrcmGLContext::getProcAddress(const char *procName)) ()
{
- return eglGetProcAddress(procName.constData());
+ return eglGetProcAddress(procName);
}
EGLConfig QWaylandBrcmGLContext::eglConfig() const
diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.h b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.h
index a83b45a0..9121079e 100644
--- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.h
+++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.h
@@ -63,7 +63,7 @@ public:
bool makeCurrent(QPlatformSurface *surface);
void doneCurrent();
- void (*getProcAddress(const QByteArray &procName)) ();
+ void (*getProcAddress(const char *procName)) ();
QSurfaceFormat format() const { return m_format; }
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
index 92761621..bd835b7e 100644
--- a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
+++ b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
@@ -575,9 +575,9 @@ bool QWaylandGLContext::isValid() const
return m_context != EGL_NO_CONTEXT;
}
-void (*QWaylandGLContext::getProcAddress(const QByteArray &procName)) ()
+void (*QWaylandGLContext::getProcAddress(const char *procName)) ()
{
- return eglGetProcAddress(procName.constData());
+ return eglGetProcAddress(procName);
}
EGLConfig QWaylandGLContext::eglConfig() const
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h
index c1d82562..fec1addd 100644
--- a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h
+++ b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h
@@ -73,7 +73,7 @@ public:
bool isSharing() const;
bool isValid() const;
- void (*getProcAddress(const QByteArray &procName)) ();
+ void (*getProcAddress(const char *procName)) ();
QSurfaceFormat format() const { return m_format; }
diff --git a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.cpp b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.cpp
index 961d4f5e..bc6e94fe 100644
--- a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.cpp
+++ b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.cpp
@@ -96,9 +96,9 @@ void QWaylandXCompositeGLXContext::swapBuffers(QPlatformSurface *surface)
w->waitForFrameSync();
}
-void (*QWaylandXCompositeGLXContext::getProcAddress(const QByteArray &procName)) ()
+void (*QWaylandXCompositeGLXContext::getProcAddress(const char *procName)) ()
{
- return glXGetProcAddress(reinterpret_cast<const GLubyte *>(procName.constData()));
+ return glXGetProcAddress(reinterpret_cast<const GLubyte *>(procName));
}
QSurfaceFormat QWaylandXCompositeGLXContext::format() const
diff --git a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h
index 0cc89da3..23a5116f 100644
--- a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h
+++ b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h
@@ -64,7 +64,7 @@ public:
bool makeCurrent(QPlatformSurface *surface);
void doneCurrent();
- void (*getProcAddress(const QByteArray &procName)) ();
+ void (*getProcAddress(const char *procName)) ();
private:
GLXContext m_context;