diff options
| author | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-12-02 10:30:40 +0100 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-12-02 10:35:50 +0100 |
| commit | 3698b116a1973146b76319673cdb6787f13f2de6 (patch) | |
| tree | de31e4c3365d6852ed1f41621960ac9e48e85106 /src/hardwareintegration/compositor/brcm-egl | |
| parent | 68993c012b88df43b2cd75a8c8704092760f28c0 (diff) | |
| parent | 4d3c3a08eba8d30805f18397c98e19ab9fd40722 (diff) | |
Merge remote-tracking branch 'qt/5.6' into wip-compositor-api
Change-Id: Ie70fdd03e1259a8cb75bbdbf1324e3e4a2b51807
Diffstat (limited to 'src/hardwareintegration/compositor/brcm-egl')
| -rw-r--r-- | src/hardwareintegration/compositor/brcm-egl/brcmbuffer.cpp | 5 | ||||
| -rw-r--r-- | src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/hardwareintegration/compositor/brcm-egl/brcmbuffer.cpp b/src/hardwareintegration/compositor/brcm-egl/brcmbuffer.cpp index 7603e9727..d71a95c15 100644 --- a/src/hardwareintegration/compositor/brcm-egl/brcmbuffer.cpp +++ b/src/hardwareintegration/compositor/brcm-egl/brcmbuffer.cpp @@ -38,7 +38,6 @@ #include <EGL/eglext.h> -#define EGL_EGLEXT_PROTOTYPES #include <EGL/eglext_brcm.h> QT_BEGIN_NAMESPACE @@ -55,7 +54,9 @@ BrcmBuffer::BrcmBuffer(struct ::wl_client *client, uint32_t id, const QSize &siz BrcmBuffer::~BrcmBuffer() { - eglDestroyGlobalImageBRCM(handle()); + static PFNEGLDESTROYGLOBALIMAGEBRCMPROC eglDestroyGlobalImage = + (PFNEGLDESTROYGLOBALIMAGEBRCMPROC) eglGetProcAddress("eglDestroyGlobalImageBRCM"); + eglDestroyGlobalImage(handle()); } void BrcmBuffer::buffer_destroy_resource(Resource *) diff --git a/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp b/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp index 5ed1a29cd..08df6359e 100644 --- a/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp +++ b/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp @@ -47,7 +47,6 @@ #include <EGL/egl.h> #include <EGL/eglext.h> -#define EGL_EGLEXT_PROTOTYPES #include <EGL/eglext_brcm.h> #include <GLES2/gl2.h> @@ -87,7 +86,7 @@ void BrcmEglIntegration::initializeHardware(QtWayland::Display *waylandDisplay) if (!d->egl_display) qWarning("Failed to acquire EGL display from platform integration"); - d->eglQueryGlobalImageBRCM = eglQueryGlobalImageBRCM; + d->eglQueryGlobalImageBRCM = (PFNEGLQUERYGLOBALIMAGEBRCMPROC) eglGetProcAddress("eglQueryGlobalImageBRCM"); if (!d->eglQueryGlobalImageBRCM) { qWarning("Failed to resolve eglQueryGlobalImageBRCM"); |