Patch Detail
Show a patch.
GET /api/patches/9640/?format=api
{ "id": 9640, "url": "https://patchwork.libcamera.org/api/patches/9640/?format=api", "web_url": "https://patchwork.libcamera.org/patch/9640/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20200916145254.1644-5-laurent.pinchart@ideasonboard.com>", "date": "2020-09-16T14:52:51", "name": "[libcamera-devel,4/7] qcam: viewfinder_gl: Rename shader files", "commit_ref": "440028d6c9a2e98234a71fee79c55791e1d2af2f", "pull_url": null, "state": "accepted", "archived": false, "hash": "801b2adb415d5c4b3c6e91e8268e81ee562214cd", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/9640/mbox/", "series": [ { "id": 1293, "url": "https://patchwork.libcamera.org/api/series/1293/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1293", "date": "2020-09-16T14:52:47", "name": "qcam: Accelerate packed YUV rendering with OpenGL", "version": 1, "mbox": "https://patchwork.libcamera.org/series/1293/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/9640/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/9640/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "X-Original-To": "parsemail@patchwork.libcamera.org", "Delivered-To": "parsemail@patchwork.libcamera.org", "Received": [ "from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 14D7BC3B5D\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 16 Sep 2020 14:54:27 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D88E362F12;\n\tWed, 16 Sep 2020 16:54:26 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id AD91462E75\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 16 Sep 2020 16:54:25 +0200 (CEST)", "from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 8624557F;\n\tWed, 16 Sep 2020 16:54:18 +0200 (CEST)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"EibeGDeo\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1600268058;\n\tbh=WNtQPblvS1DG6XawIadlAwEOk0KVrGsYstuQN6ZEQgo=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=EibeGDeoNl4N484nsLy3eTBuaDD1P2PcDuIe907inMaivQXCEHG0+3Mq3aU1DOFKU\n\tgYVxlun7bYB/1x+dy5vqEChsSD/i7fxPslDzNvDmZ0H8JJXYp4HIYg613M+3ELRQwy\n\tCSsTkIjOepPLMv8zHgOsEVGYQtm6J+GYtrL0gKwU=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 16 Sep 2020 17:52:51 +0300", "Message-Id": "<20200916145254.1644-5-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.27.0", "In-Reply-To": "<20200916145254.1644-1-laurent.pinchart@ideasonboard.com>", "References": "<20200916145254.1644-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH 4/7] qcam: viewfinder_gl: Rename shader\n\tfiles", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Rename shader files to prepare for packed YUYV support:\n\n- The NV prefix isn't a good match for packed (or for 3-planar) formats,\n replace it with a YUV prefix\n- Use .frag and .vert extensions to differentiate between fragment and\n vertex shaders\n\nWhile at it, remove the uneeded './' file name prefix in shaders.qrc.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n .../shader/{NV_vertex_shader.glsl => YUV.vert} | 2 +-\n ...2_planes_UV_f.glsl => YUV_2_planes_UV.frag} | 2 +-\n ...2_planes_VU_f.glsl => YUV_2_planes_VU.frag} | 2 +-\n .../{NV_3_planes_f.glsl => YUV_3_planes.frag} | 2 +-\n src/qcam/assets/shader/shaders.qrc | 8 ++++----\n src/qcam/viewfinder_gl.cpp | 18 +++++++++---------\n 6 files changed, 17 insertions(+), 17 deletions(-)\n rename src/qcam/assets/shader/{NV_vertex_shader.glsl => YUV.vert} (79%)\n rename src/qcam/assets/shader/{NV_2_planes_UV_f.glsl => YUV_2_planes_UV.frag} (88%)\n rename src/qcam/assets/shader/{NV_2_planes_VU_f.glsl => YUV_2_planes_VU.frag} (88%)\n rename src/qcam/assets/shader/{NV_3_planes_f.glsl => YUV_3_planes.frag} (90%)", "diff": "diff --git a/src/qcam/assets/shader/NV_vertex_shader.glsl b/src/qcam/assets/shader/YUV.vert\nsimilarity index 79%\nrename from src/qcam/assets/shader/NV_vertex_shader.glsl\nrename to src/qcam/assets/shader/YUV.vert\nindex 12e791e31e32..f38e8045db89 100644\n--- a/src/qcam/assets/shader/NV_vertex_shader.glsl\n+++ b/src/qcam/assets/shader/YUV.vert\n@@ -2,7 +2,7 @@\n /*\n * Copyright (C) 2020, Linaro\n *\n- * NV_vertex_shader.glsl - Vertex shader code for NV family\n+ * YUV.vert - Vertex shader for YUV to RGB conversion\n */\n \n attribute vec4 vertexIn;\ndiff --git a/src/qcam/assets/shader/NV_2_planes_UV_f.glsl b/src/qcam/assets/shader/YUV_2_planes_UV.frag\nsimilarity index 88%\nrename from src/qcam/assets/shader/NV_2_planes_UV_f.glsl\nrename to src/qcam/assets/shader/YUV_2_planes_UV.frag\nindex 67633a11ee0f..081caea9214b 100644\n--- a/src/qcam/assets/shader/NV_2_planes_UV_f.glsl\n+++ b/src/qcam/assets/shader/YUV_2_planes_UV.frag\n@@ -2,7 +2,7 @@\n /*\n * Copyright (C) 2020, Linaro\n *\n- * NV_2_planes_UV_f.glsl - Fragment shader code for NV12, NV16 and NV24 formats\n+ * YUV_2_planes_UV.frag - Fragment shader code for NV12, NV16 and NV24 formats\n */\n \n #ifdef GL_ES\ndiff --git a/src/qcam/assets/shader/NV_2_planes_VU_f.glsl b/src/qcam/assets/shader/YUV_2_planes_VU.frag\nsimilarity index 88%\nrename from src/qcam/assets/shader/NV_2_planes_VU_f.glsl\nrename to src/qcam/assets/shader/YUV_2_planes_VU.frag\nindex 086c5b6d11bd..f4a5a5ac46c0 100644\n--- a/src/qcam/assets/shader/NV_2_planes_VU_f.glsl\n+++ b/src/qcam/assets/shader/YUV_2_planes_VU.frag\n@@ -2,7 +2,7 @@\n /*\n * Copyright (C) 2020, Linaro\n *\n- * NV_2_planes_VU_f.glsl - Fragment shader code for NV21, NV61 and NV42 formats\n+ * YUV_2_planes_VU.frag - Fragment shader code for NV21, NV61 and NV42 formats\n */\n \n #ifdef GL_ES\ndiff --git a/src/qcam/assets/shader/NV_3_planes_f.glsl b/src/qcam/assets/shader/YUV_3_planes.frag\nsimilarity index 90%\nrename from src/qcam/assets/shader/NV_3_planes_f.glsl\nrename to src/qcam/assets/shader/YUV_3_planes.frag\nindex 4bc941842710..2be74b5d2a9d 100644\n--- a/src/qcam/assets/shader/NV_3_planes_f.glsl\n+++ b/src/qcam/assets/shader/YUV_3_planes.frag\n@@ -2,7 +2,7 @@\n /*\n * Copyright (C) 2020, Linaro\n *\n- * NV_3_planes_UV_f.glsl - Fragment shader code for YUV420 format\n+ * YUV_3_planes_UV.frag - Fragment shader code for YUV420 format\n */\n \n #ifdef GL_ES\ndiff --git a/src/qcam/assets/shader/shaders.qrc b/src/qcam/assets/shader/shaders.qrc\nindex 9ae35c9f70d6..533396d1fb28 100644\n--- a/src/qcam/assets/shader/shaders.qrc\n+++ b/src/qcam/assets/shader/shaders.qrc\n@@ -1,9 +1,9 @@\n <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->\n <!DOCTYPE RCC><RCC version=\"1.0\">\n <qresource>\n-\t<file>NV_vertex_shader.glsl</file>\n-\t<file>NV_2_planes_UV_f.glsl</file>\n-\t<file>NV_2_planes_VU_f.glsl</file>\n-\t<file>NV_3_planes_f.glsl</file>\n+\t<file>YUV.vert</file>\n+\t<file>YUV_2_planes_UV.frag</file>\n+\t<file>YUV_2_planes_VU.frag</file>\n+\t<file>YUV_3_planes.frag</file>\n </qresource>\n </RCC>\ndiff --git a/src/qcam/viewfinder_gl.cpp b/src/qcam/viewfinder_gl.cpp\nindex 76e4a900a25a..0fa06a290959 100644\n--- a/src/qcam/viewfinder_gl.cpp\n+++ b/src/qcam/viewfinder_gl.cpp\n@@ -101,42 +101,42 @@ bool ViewFinderGL::selectFormat(const libcamera::PixelFormat &format)\n \tcase libcamera::formats::NV12:\n \t\thorzSubSample_ = 2;\n \t\tvertSubSample_ = 2;\n-\t\tfragmentShaderSrc_ = \":NV_2_planes_UV_f.glsl\";\n+\t\tfragmentShaderSrc_ = \":YUV_2_planes_UV.frag\";\n \t\tbreak;\n \tcase libcamera::formats::NV21:\n \t\thorzSubSample_ = 2;\n \t\tvertSubSample_ = 2;\n-\t\tfragmentShaderSrc_ = \":NV_2_planes_VU_f.glsl\";\n+\t\tfragmentShaderSrc_ = \":YUV_2_planes_VU.frag\";\n \t\tbreak;\n \tcase libcamera::formats::NV16:\n \t\thorzSubSample_ = 2;\n \t\tvertSubSample_ = 1;\n-\t\tfragmentShaderSrc_ = \":NV_2_planes_UV_f.glsl\";\n+\t\tfragmentShaderSrc_ = \":YUV_2_planes_UV.frag\";\n \t\tbreak;\n \tcase libcamera::formats::NV61:\n \t\thorzSubSample_ = 2;\n \t\tvertSubSample_ = 1;\n-\t\tfragmentShaderSrc_ = \":NV_2_planes_VU_f.glsl\";\n+\t\tfragmentShaderSrc_ = \":YUV_2_planes_VU.frag\";\n \t\tbreak;\n \tcase libcamera::formats::NV24:\n \t\thorzSubSample_ = 1;\n \t\tvertSubSample_ = 1;\n-\t\tfragmentShaderSrc_ = \":NV_2_planes_UV_f.glsl\";\n+\t\tfragmentShaderSrc_ = \":YUV_2_planes_UV.frag\";\n \t\tbreak;\n \tcase libcamera::formats::NV42:\n \t\thorzSubSample_ = 1;\n \t\tvertSubSample_ = 1;\n-\t\tfragmentShaderSrc_ = \":NV_2_planes_VU_f.glsl\";\n+\t\tfragmentShaderSrc_ = \":YUV_2_planes_VU.frag\";\n \t\tbreak;\n \tcase libcamera::formats::YUV420:\n \t\thorzSubSample_ = 2;\n \t\tvertSubSample_ = 2;\n-\t\tfragmentShaderSrc_ = \":NV_3_planes_f.glsl\";\n+\t\tfragmentShaderSrc_ = \":YUV_3_planes.frag\";\n \t\tbreak;\n \tcase libcamera::formats::YVU420:\n \t\thorzSubSample_ = 2;\n \t\tvertSubSample_ = 2;\n-\t\tfragmentShaderSrc_ = \":NV_3_planes_f.glsl\";\n+\t\tfragmentShaderSrc_ = \":YUV_3_planes.frag\";\n \t\tbreak;\n \tdefault:\n \t\tret = false;\n@@ -154,7 +154,7 @@ bool ViewFinderGL::createVertexShader()\n \tvertexShader_ = new QOpenGLShader(QOpenGLShader::Vertex, this);\n \n \t/* Compile the vertex shader */\n-\tif (!vertexShader_->compileSourceFile(\":NV_vertex_shader.glsl\")) {\n+\tif (!vertexShader_->compileSourceFile(\":YUV.vert\")) {\n \t\tqWarning() << \"[ViewFinderGL]:\" << vertexShader_->log();\n \t\treturn false;\n \t}\n", "prefixes": [ "libcamera-devel", "4/7" ] }