diff options
| author | Gunnar Sletta <gunnar@sletta.org> | 2014-09-04 08:05:13 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar@sletta.org> | 2014-09-05 18:14:15 +0200 |
| commit | 0e2c32931387cd89d97011ff1b9f9baed0975ccc (patch) | |
| tree | d7aebc2adff06c34cb01ec29b807bbb0cc9998a0 /src | |
| parent | 3cae7dcc5af53bacbf2e181092895c7b27439bca (diff) | |
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 <laszlo.agocs@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/opengl/qopengl.h | 6 | ||||
| -rw-r--r-- | 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 65bfc7f868..56e99ee8b8 100644 --- a/src/gui/opengl/qopengl.h +++ b/src/gui/opengl/qopengl.h @@ -117,12 +117,6 @@ typedef char GLchar; # include <QtGui/qopengles2ext.h> # 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 <OpenGL/gl.h> diff --git a/src/gui/opengl/qopenglfunctions.h b/src/gui/opengl/qopenglfunctions.h index de1de39db2..b9e7523aad 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 |