1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove GLdouble and GL_DOUBLE typedefs for OpenGL ES 2.

Browse Source 
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>
This commit is contained in:
Gunnar Sletta 2014-09-04 08:05:13 +02:00
parent 3cae7dcc5a
commit 0e2c329313
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/opengl/qopengl.h
View File

@ -117,12 +117,6 @@ typedef char GLchar;
# include <QtGui/qopengles2ext.h> # include <QtGui/qopengles2ext.h>
# endif // Q_OS_MAC # endif // Q_OS_MAC
# ifndef GL_DOUBLE
# define GL_DOUBLE GL_FLOAT
# endif
# ifndef GLdouble
typedef GLfloat GLdouble;
# endif
#else // non-ES2 platforms #else // non-ES2 platforms
# if defined(Q_OS_MAC) # if defined(Q_OS_MAC)
# include <OpenGL/gl.h> # include <OpenGL/gl.h>

2
src/gui/opengl/qopenglfunctions.h
View File

@ -563,8 +563,10 @@ struct QOpenGLFunctionsPrivate
void (QOPENGLF_APIENTRYP VertexAttribPointer)(GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void* ptr); 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 // Special non-ES OpenGL variants, not to be called directly
#ifndef QT_OPENGL_ES_2
void (QOPENGLF_APIENTRYP ClearDepth)(GLdouble depth); void (QOPENGLF_APIENTRYP ClearDepth)(GLdouble depth);
void (QOPENGLF_APIENTRYP DepthRange)(GLdouble zNear, GLdouble zFar); void (QOPENGLF_APIENTRYP DepthRange)(GLdouble zNear, GLdouble zFar);
#endif
}; };
// GLES2 + OpenGL1 common subset // GLES2 + OpenGL1 common subset