From 52094e25202ab4f5b5fdcacf3ce586f56aec5004 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Fri, 3 Feb 2017 12:19:01 +0100 Subject: egl: Expose direct function pointers on INTEGRITY Change-Id: I4f7df9abcd580297a40fd9dd16a26f5f93e1c4c7 Reviewed-by: Jesus Fernandez Reviewed-by: Andy Nichols --- src/gui/opengl/qopengl.h | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'src/gui/opengl/qopengl.h') diff --git a/src/gui/opengl/qopengl.h b/src/gui/opengl/qopengl.h index cd44ddfe4d..a76da20910 100644 --- a/src/gui/opengl/qopengl.h +++ b/src/gui/opengl/qopengl.h @@ -83,17 +83,16 @@ typedef void* GLeglImageOES; # else // "uncontrolled" ES2 platforms -// In "es2" builds (QT_OPENGL_ES_2) additional defines indicate if ES -// 3.0 or higher is available. In this case include the corresponding -// header. These are backwards compatible and it should be safe to -// include headers on top of each other, meaning that applications can -// include gl2.h even if gl31.h gets included here. - -// NB! This file contains the only usages of the ES_3 and ES_3_1 -// macros. They are useless for pretty much anything else. The fact -// that Qt was built against an SDK with f.ex. ES 2 only does not mean -// applications cannot target ES 3. Therefore QOpenGLFunctions and -// friends do everything dynamically and never rely on these macros. +// 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 +// header. These are backwards compatible and it should be safe to include +// headers on top of each other, meaning that applications can include gl2.h +// even if gl31.h gets included here. + +// NB! The fact that Qt was built against an SDK with GLES 2 only does not mean +// applications cannot be deployed on a GLES 3 system. Therefore +// QOpenGLFunctions and friends must do everything dynamically and must not rely +// on these macros, except in special cases for controlled build/run environments. // Some Khronos headers use the ext proto guard in the standard headers as well, // which is bad. Work it around, but avoid spilling over to the ext header. -- cgit v1.2.3