yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix the GLES build

Browse source
This commit is contained in:
Fredrik Höglund 2014-07-22 12:28:07 +02:00
parent b1586daab4
commit aa7f9f26f6
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libkwineffects/kwinglcolorcorrection.cpp
View file

@ -290,7 +290,7 @@ bool ColorCorrection::setEnabled(bool enabled)
#ifdef KWIN_HAVE_OPENGLES
const GLPlatform *gl = GLPlatform::instance();
if (enabled && gl->isGLES() && !m_haveTexture3D) {
if (enabled && gl->isGLES() && !d->m_haveTexture3D) {
qCritical() << "color correction is not supported on OpenGL ES without OES_texture_3D";
d->m_hasError = true;
return false;

13
libkwineffects/kwinglutils_funcs.h
View file

@ -37,6 +37,19 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <epoxy/gl.h>
// qopengl.h declares GLdouble as a typedef of float when Qt is built
// with GLES support. This conflicts with the epoxy/gl_generated.h
// declaration, so we have to prevent the Qt header from being #included.
#define QOPENGL_H
#ifndef QOPENGLF_APIENTRY
#define QOPENGLF_APIENTRY GLAPIENTRY
#endif
#ifndef QOPENGLF_APIENTRYP
#define QOPENGLF_APIENTRYP GLAPIENTRYP
#endif
namespace KWin
{