diff options
| author | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-03-04 15:06:36 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-10 15:10:37 +0100 |
| commit | 1e8de50674f5b33a50c45224b7e07b3f974f6ab0 (patch) | |
| tree | a52d4e421be3c6c2deb4ff07905d5715012b0d9a /src/gui/opengl/qopengl.h | |
| parent | 11eb9d37dc191b6e71c903e4f7f4d2da579e7df5 (diff) | |
Avoid using direct OpenGL calls in gui and widgets
Change-Id: I5d88a2e204ca23e178a4e3044b9cb13392c3e763
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
Diffstat (limited to 'src/gui/opengl/qopengl.h')
| -rw-r--r-- | src/gui/opengl/qopengl.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/gui/opengl/qopengl.h b/src/gui/opengl/qopengl.h index 6eb656cd09..190c05ba26 100644 --- a/src/gui/opengl/qopengl.h +++ b/src/gui/opengl/qopengl.h @@ -66,7 +66,7 @@ // which the system headers do not. #if defined(QT_OPENGL_ES_2) -# if defined(Q_OS_MAC) +# if defined(Q_OS_MAC) // iOS # include <OpenGLES/ES2/gl.h> # include <OpenGLES/ES2/glext.h> @@ -78,7 +78,7 @@ */ typedef void* GLeglImageOES; -# else // "uncontrolled" platforms +# else // "uncontrolled" ES2 platforms # include <GLES2/gl2.h> /* @@ -90,14 +90,14 @@ typedef void* GLeglImageOES; typedef char GLchar; # include <QtGui/qopengles2ext.h> -# ifndef GL_DOUBLE -# define GL_DOUBLE GL_FLOAT -# endif -# ifndef GLdouble -typedef GLfloat GLdouble; -# endif # endif // Q_OS_MAC -#else +# 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> # if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 @@ -110,7 +110,7 @@ typedef GLfloat GLdouble; # include <GL/gl.h> # include <QtGui/qopenglext.h> # endif // Q_OS_MAC -#endif +#endif // QT_OPENGL_ES_2 // Desktops, apart from Mac OS X prior to 10.7 can support OpenGL 3 // and desktops apart from Mac can support OpenGL 4 |