From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Wed, 26 Feb 2014 19:41:57 +0000 (+0100)
Subject: qv4l2: add check if the shader function is available.
X-Git-Tag: v4l-utils-1.2.0~171
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ce644f4c05fb6e8e2cfa88b29a2c6a9a49e6e723;p=platform%2Fupstream%2Fv4l-utils.git

qv4l2: add check if the shader function is available.

Skip formats that need a shader if there isn't any. Particularly useful
when running qv4l2 over ssh.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
---

diff --git a/utils/qv4l2/capture-win-gl.cpp b/utils/qv4l2/capture-win-gl.cpp
index 8038257..7127298 100644
--- a/utils/qv4l2/capture-win-gl.cpp
+++ b/utils/qv4l2/capture-win-gl.cpp
@@ -155,26 +155,33 @@ void CaptureWinGLEngine::checkError(const char *msg)
 	if (err) fprintf(stderr, "OpenGL Error 0x%x: %s.\n", err, msg);
 }
 
+struct supported_fmt {
+	__u32 fmt;
+	bool uses_shader;
+};
+
 bool CaptureWinGLEngine::hasNativeFormat(__u32 format)
 {
-	static const __u32 supported_fmts[] = {
-		V4L2_PIX_FMT_RGB32,
-		V4L2_PIX_FMT_BGR32,
-		V4L2_PIX_FMT_RGB24,
-		V4L2_PIX_FMT_BGR24,
-		V4L2_PIX_FMT_RGB565,
-		V4L2_PIX_FMT_RGB555,
-		V4L2_PIX_FMT_YUYV,
-		V4L2_PIX_FMT_YVYU,
-		V4L2_PIX_FMT_UYVY,
-		V4L2_PIX_FMT_VYUY,
-		V4L2_PIX_FMT_YVU420,
-		V4L2_PIX_FMT_YUV420,
-		0
+	static const struct supported_fmt supported_fmts[] = {
+		{ V4L2_PIX_FMT_RGB32, false },
+		{ V4L2_PIX_FMT_BGR32, false },
+		{ V4L2_PIX_FMT_RGB24, false },
+		{ V4L2_PIX_FMT_BGR24, true },
+		{ V4L2_PIX_FMT_RGB565, false },
+		{ V4L2_PIX_FMT_RGB555, false },
+		{ V4L2_PIX_FMT_YUYV, true },
+		{ V4L2_PIX_FMT_YVYU, true },
+		{ V4L2_PIX_FMT_UYVY, true },
+		{ V4L2_PIX_FMT_VYUY, true },
+		{ V4L2_PIX_FMT_YVU420, true },
+		{ V4L2_PIX_FMT_YUV420, true },
+		{ 0, false }
 	};
+	bool haveShaders = m_glfunction.hasOpenGLFeature(QGLFunctions::Shaders);
 
-	for (int i = 0; supported_fmts[i]; i++)
-		if (supported_fmts[i] == format)
+	for (int i = 0; supported_fmts[i].fmt; i++)
+		if (supported_fmts[i].fmt == format &&
+		    (!supported_fmts[i].uses_shader || haveShaders))
 			return true;
 
 	return false;