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

Be more explicit about the supported platforms for OpenGL ES 2

Browse Source 
The OpenGLES framework is only supported on iOS and tvOS, and does not
exist on macOS and watchOS.

Change-Id: I643d3bdac522b67a8d945648dfcc8f1780ab0d7f
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
This commit is contained in:
Jake Petroules 2017-04-12 17:08:18 -07:00
parent e7443b88fc
commit fbcdf6d753
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,7 +49,7 @@
# include <QtCore/qt_windows.h> # include <QtCore/qt_windows.h>
#endif #endif
// Note: Mac OSX is a "controlled platform" for OpenGL ABI so we // Note: Apple is a "controlled platform" for OpenGL ABI so we
// use the system provided headers there. Controlled means that the // use the system provided headers there. Controlled means that the
// headers always match the actual driver implementation so there // headers always match the actual driver implementation so there
// is no possibility of drivers exposing additional functionality // is no possibility of drivers exposing additional functionality
@ -64,7 +64,7 @@
// which the system headers do not. // which the system headers do not.
#if defined(QT_OPENGL_ES_2) #if defined(QT_OPENGL_ES_2)
# if defined(Q_OS_MAC) // iOS # if defined(Q_OS_IOS) || defined(Q_OS_TVOS)
# if defined(QT_OPENGL_ES_3) # if defined(QT_OPENGL_ES_3)
# include <OpenGLES/ES3/gl.h> # include <OpenGLES/ES3/gl.h>
# include <OpenGLES/ES3/glext.h> # include <OpenGLES/ES3/glext.h>
@ -81,7 +81,7 @@
*/ */
typedef void* GLeglImageOES; typedef void* GLeglImageOES;
# else // "uncontrolled" ES2 platforms # elif !defined(Q_OS_DARWIN) // "uncontrolled" ES2 platforms
// In "es2" builds (QT_OPENGL_ES_2) additional defines indicate GLES 3.0 or // In "es2" builds (QT_OPENGL_ES_2) additional defines indicate GLES 3.0 or
// higher is available *at build time*. In this case include the corresponding // higher is available *at build time*. In this case include the corresponding