diff options
| author | Jorgen Lind <jorgen.lind@digia.com> | 2013-11-22 09:13:03 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-27 15:33:01 +0100 |
| commit | cdf039711561643a5048cea0e49a833e8baeb7b0 (patch) | |
| tree | 5662e7088b0d426561859da99ce3b94d2c1f3c3a /src/hardwareintegration | |
| parent | e2350c6abe087a27deb7b1288c09a9cc48d585e1 (diff) | |
| download | qtwayland-cdf039711561643a5048cea0e49a833e8baeb7b0.tar.gz | |
Remove compiler warnings in compositor:wayland-egl
Change-Id: I898e7f55076cb55996fd44931eb74e9fb112ceed
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Diffstat (limited to 'src/hardwareintegration')
| -rw-r--r-- | src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp index ffefdc86..bd77db63 100644 --- a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp +++ b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp @@ -133,7 +133,7 @@ void WaylandEglClientBufferIntegration::initializeHardware(QtWayland::Display *w d->egl_bind_wayland_display = reinterpret_cast<PFNEGLBINDWAYLANDDISPLAYWL>(eglGetProcAddress("eglBindWaylandDisplayWL")); d->egl_unbind_wayland_display = reinterpret_cast<PFNEGLUNBINDWAYLANDDISPLAYWL>(eglGetProcAddress("eglUnbindWaylandDisplayWL")); - if (!d->egl_bind_wayland_display || !d->egl_unbind_wayland_display && !ignoreBindDisplay) { + if ((!d->egl_bind_wayland_display || !d->egl_unbind_wayland_display) && !ignoreBindDisplay) { qWarning("Failed to initialize egl display. Could not find eglBindWaylandDisplayWL and eglUnbindWaylandDisplayWL.\n"); return; } @@ -201,9 +201,9 @@ GLuint WaylandEglClientBufferIntegration::createTextureFromBuffer(struct ::wl_re bool WaylandEglClientBufferIntegration::isYInverted(struct ::wl_resource *buffer) const { +#if defined(EGL_WAYLAND_Y_INVERTED_WL) Q_D(const WaylandEglClientBufferIntegration); -#if defined(EGL_WAYLAND_Y_INVERTED_WL) EGLint isYInverted; EGLBoolean ret; ret = d->egl_query_wayland_buffer(d->egl_display, reinterpret_cast<struct ::wl_buffer *>(buffer), EGL_WAYLAND_Y_INVERTED_WL, &isYInverted); |