From 0e2c32931387cd89d97011ff1b9f9baed0975ccc Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Thu, 4 Sep 2014 08:05:13 +0200 Subject: [PATCH] Remove GLdouble and GL_DOUBLE typedefs for OpenGL ES 2. We have no business defining types which come from another library. These originally stem from the S60 port without further explanation and Qt and its examples today compile without them, so remove them. Change-Id: I683ea897c00ab3a1f7c809c45352fe590ae9a41f Reviewed-by: Laszlo Agocs --- src/gui/opengl/qopengl.h | 6 ------ src/gui/opengl/qopenglfunctions.h | 2 ++ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/gui/opengl/qopengl.h b/src/gui/opengl/qopengl.h index 65bfc7f8687..56e99ee8b8c 100644 --- a/src/gui/opengl/qopengl.h +++ b/src/gui/opengl/qopengl.h @@ -117,12 +117,6 @@ typedef char GLchar; # include # endif // Q_OS_MAC -# ifndef GL_DOUBLE -# define GL_DOUBLE GL_FLOAT -# endif -# ifndef GLdouble -typedef GLfloat GLdouble; -# endif #else // non-ES2 platforms # if defined(Q_OS_MAC) # include diff --git a/src/gui/opengl/qopenglfunctions.h b/src/gui/opengl/qopenglfunctions.h index de1de39db21..b9e7523aadf 100644 --- a/src/gui/opengl/qopenglfunctions.h +++ b/src/gui/opengl/qopenglfunctions.h @@ -563,8 +563,10 @@ struct QOpenGLFunctionsPrivate void (QOPENGLF_APIENTRYP VertexAttribPointer)(GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void* ptr); // Special non-ES OpenGL variants, not to be called directly +#ifndef QT_OPENGL_ES_2 void (QOPENGLF_APIENTRYP ClearDepth)(GLdouble depth); void (QOPENGLF_APIENTRYP DepthRange)(GLdouble zNear, GLdouble zFar); +#endif }; // GLES2 + OpenGL1 common subset