diff options
| author | Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> | 2015-03-04 22:30:00 +0000 |
|---|---|---|
| committer | Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> | 2015-04-11 13:15:55 +0000 |
| commit | d5e7965a87d81e2d7157c785403b0aba681de62a (patch) | |
| tree | 95eb4ec73f60b8b5227d93752b07c5939222ed10 | |
| parent | 72aa34dc2aebbea715a5915f26cb6f0f67e164d1 (diff) | |
| download | qtwayland-d5e7965a87d81e2d7157c785403b0aba681de62a.tar.gz qtwayland-d5e7965a87d81e2d7157c785403b0aba681de62a.tar.bz2 qtwayland-d5e7965a87d81e2d7157c785403b0aba681de62a.zip | |
brcm-egl: Avoid conflicts with GLES3
qopengl.h includes GLES3 which conflicts with GLES2 declarations.
Might happen because Qt is built with desktop GL.
This patch fixes the following build error.
In file included from ../../../../hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp:61:0:
/opt/vc/include/GLES2/gl2.h:600:125: error: conflicting declaration of C function 'void glShaderSource(GLuint, GLsizei, const GLchar**, const GLint*)'
GL_APICALL void GL_APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar** string, const GLint* length);
^
In file included from /usr/include/qt/QtGui/qopengl.h:97:0,
from ../../../../../include/QtCompositor/5.5.0/QtCompositor/private/../../../../../src/compositor/hardware_integration/qwlclientbufferintegration_p.h:46,
from ../../../../../include/QtCompositor/5.5.0/QtCompositor/private/qwlclientbufferintegration_p.h:1,
from ../../../../hardwareintegration/compositor/brcm-egl/brcmeglintegration.h:44,
from ../../../../hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp:44:
/usr/include/GLES3/gl3.h:475:29: note: previous declaration 'void glShaderSource(GLuint, GLsizei, const GLchar* const*, const GLint*)'
GL_APICALL void GL_APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar *const*string, const GLint *length);
Change-Id: I49ae11457b70b05f740ce70b8c1cfa5d6aa554bb
Reviewed-by: Olivier Blin <qt@blino.org>
Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
| -rw-r--r-- | src/hardwareintegration/compositor/brcm-egl/brcm-egl.pri | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/hardwareintegration/compositor/brcm-egl/brcm-egl.pri b/src/hardwareintegration/compositor/brcm-egl/brcm-egl.pri index 6c4234c3..83c7b621 100644 --- a/src/hardwareintegration/compositor/brcm-egl/brcm-egl.pri +++ b/src/hardwareintegration/compositor/brcm-egl/brcm-egl.pri @@ -2,6 +2,8 @@ QT = compositor compositor-private core-private gui-private INCLUDEPATH += $$PWD +DEFINES += QT_NO_OPENGL_ES_3 + !contains(QT_CONFIG, no-pkg-config) { CONFIG += link_pkgconfig PKGCONFIG += wayland-server |