a26e3ecc3d
In ES builds configure will now check for OpenGL ES 3.0 and 3.1 availability. This allows qopengl.h to include the correct header and, by defining QT_OPENGL_ES_3 and QT_OPENGL_ES_3_1, the OpenGL wrappers can provide support for MapBuffer, VAOs, etc. on GLES 3.0+ too. Right now this is not possible since the only standard way to use an ES function specific to a given version is to use the function directly. The extension mechanism (eglGetProcAddress and friends), that is often used in desktop GL, is not available for such functions. [ChangeLog][QtGui] QtGui's OpenGL headers are now automatically including the highest available header (gl31.h, gl3.h or gl2.h) in OpenGL ES builds. Task-number: QTBUG-38168 Change-Id: Ib857c58fe1696a9546fdd1aa143a9237e80325a5 Reviewed-by: Jørgen Lind <jorgen.lind@digia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
17 lines
365 B
Prolog
17 lines
365 B
Prolog
# The library is expected to be the same as in ES 2.0 (libGLESv2).
|
|
# The difference is the header and the presence of the functions in
|
|
# the library.
|
|
|
|
SOURCES = opengles3.cpp
|
|
INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2
|
|
|
|
for(p, QMAKE_LIBDIR_OPENGL_ES2) {
|
|
exists($$p):LIBS += -L$$p
|
|
}
|
|
|
|
CONFIG -= qt
|
|
LIBS += $$QMAKE_LIBS_OPENGL_ES2
|
|
mac {
|
|
DEFINES += BUILD_ON_MAC
|
|
}
|