This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/cgit.cgi/v4l-utils.git tree:
Subject: qv4l2: signal that we don't want GLES Author: Hans Verkuil <[email protected]> Date: Sat Feb 20 12:09:25 2016 +0100 By defining QT_NO_OPENGL_ES_2 we include the non ES headers which allows us to at least compile qv4l2 on a system where libQt5OpenGL.so is compiled against GLES. The application really should test for the required features and automatically switch to software rendering, but I haven't figured that out yet. So for now opengl rendering should be disabled manually. It would be even better if openGL ES is supported, but that's something for the future. Signed-off-by: Hans Verkuil <[email protected]> utils/qv4l2/capture-win-gl.h | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=c185420d494d8985ec3aab6b2a28f858046052b5 diff --git a/utils/qv4l2/capture-win-gl.h b/utils/qv4l2/capture-win-gl.h index f757ad96c25d..53747673df66 100644 --- a/utils/qv4l2/capture-win-gl.h +++ b/utils/qv4l2/capture-win-gl.h @@ -20,17 +20,22 @@ #include <config.h> -#include "qv4l2.h" -#include "capture-win.h" - -#include <QResizeEvent> - #ifdef HAVE_QTGL #define GL_GLEXT_PROTOTYPES +#define QT_NO_OPENGL_ES_2 + #include <QGLWidget> #include <QGLShader> #include <QGLShaderProgram> #include <QGLFunctions> +#endif + +#include "qv4l2.h" +#include "capture-win.h" + +#include <QResizeEvent> + +#ifdef HAVE_QTGL // This must be equal to the max number of textures that any shader uses #define MAX_TEXTURES_NEEDED 3 _______________________________________________ linuxtv-commits mailing list [email protected] http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
