[{"id":12551,"web_url":"https://patchwork.libcamera.org/comment/12551/","msgid":"<20200916151628.GH1850958@oden.dyn.berto.se>","date":"2020-09-16T15:16:28","subject":"Re: [libcamera-devel] [PATCH 4/7] qcam: viewfinder_gl: Rename\n\tshader files","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Laurent,\n\nThanks for your work.\n\nOn 2020-09-16 17:52:51 +0300, Laurent Pinchart wrote:\n> 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> \n> While at it, remove the uneeded './' file name prefix in shaders.qrc.\n\nThis have been moved to a different patch in the series, I like it! ;-)\n\nWith this dropped from commit message,\n\nReviewed-by: Niklas Söderlund \n\n> \n> Signed-off-by: Laurent Pinchart \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%)\n> \n> diff --git a/src/qcam/assets/shader/NV_vertex_shader.glsl b/src/qcam/assets/shader/YUV.vert\n> similarity index 79%\n> rename from src/qcam/assets/shader/NV_vertex_shader.glsl\n> rename to src/qcam/assets/shader/YUV.vert\n> index 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;\n> diff --git a/src/qcam/assets/shader/NV_2_planes_UV_f.glsl b/src/qcam/assets/shader/YUV_2_planes_UV.frag\n> similarity index 88%\n> rename from src/qcam/assets/shader/NV_2_planes_UV_f.glsl\n> rename to src/qcam/assets/shader/YUV_2_planes_UV.frag\n> index 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\n> diff --git a/src/qcam/assets/shader/NV_2_planes_VU_f.glsl b/src/qcam/assets/shader/YUV_2_planes_VU.frag\n> similarity index 88%\n> rename from src/qcam/assets/shader/NV_2_planes_VU_f.glsl\n> rename to src/qcam/assets/shader/YUV_2_planes_VU.frag\n> index 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\n> diff --git a/src/qcam/assets/shader/NV_3_planes_f.glsl b/src/qcam/assets/shader/YUV_3_planes.frag\n> similarity index 90%\n> rename from src/qcam/assets/shader/NV_3_planes_f.glsl\n> rename to src/qcam/assets/shader/YUV_3_planes.frag\n> index 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\n> diff --git a/src/qcam/assets/shader/shaders.qrc b/src/qcam/assets/shader/shaders.qrc\n> index 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> \n> \n> \n> -\tNV_vertex_shader.glsl\n> -\tNV_2_planes_UV_f.glsl\n> -\tNV_2_planes_VU_f.glsl\n> -\tNV_3_planes_f.glsl\n> +\tYUV.vert\n> +\tYUV_2_planes_UV.frag\n> +\tYUV_2_planes_VU.frag\n> +\tYUV_3_planes.frag\n> \n> \n> diff --git a/src/qcam/viewfinder_gl.cpp b/src/qcam/viewfinder_gl.cpp\n> index 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> -- \n> Regards,\n> \n> Laurent Pinchart\n> \n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"","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 B4419BF01C\n\tfor ;\n\tWed, 16 Sep 2020 15:16:31 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 40BBE62EBD;\n\tWed, 16 Sep 2020 17:16:31 +0200 (CEST)","from mail-lf1-x141.google.com (mail-lf1-x141.google.com\n\t[IPv6:2a00:1450:4864:20::141])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 34DC460533\n\tfor ;\n\tWed, 16 Sep 2020 17:16:30 +0200 (CEST)","by mail-lf1-x141.google.com with SMTP id y17so7392072lfa.8\n\tfor ;\n\tWed, 16 Sep 2020 08:16:30 -0700 (PDT)","from localhost (h-209-203.A463.priv.bahnhof.se. [155.4.209.203])\n\tby smtp.gmail.com with ESMTPSA id\n\tw12sm4646345lfk.193.2020.09.16.08.16.28\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 16 Sep 2020 08:16:28 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=ragnatech-se.20150623.gappssmtp.com\n\theader.i=@ragnatech-se.20150623.gappssmtp.com\n\theader.b=\"LRilfFmt\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to;\n\tbh=KCGlDSMF3r5jfZnc1qCUwsDoZxvRQ5tq1DRZvSU1AIw=;\n\tb=LRilfFmtSGjF5OPEmQx5lmagSN/7LpguiHdEGkg1IjKXwSdYFl5ub0we6cwm+jS6rp\n\tkOm7XvlzEZP9cWi80Ywo4eYsMncxyFuxz50Ta3FHA/ifwBKSj58V8/TIvimYKDBxn4kQ\n\ttkuZuVWNCj/oQXhIwJtYuq2ZSH7EBrRkCOTzd4F7FIBz+/9+T+g1hVIQ4FR+QAPxOpKw\n\txYTqxjqQmcQhy4BDKPCS04wLpsQcO0afA4fA17DiKF/HSVHre/ZP5e+KSINbVW9jgFk3\n\txejiBh1kQlUdM9uvVQ2fRaQFks+XgUoh4KXPPmnb52Bh7e8fQdIhSGV642M+Hfq4BXRj\n\tqYGQ==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to;\n\tbh=KCGlDSMF3r5jfZnc1qCUwsDoZxvRQ5tq1DRZvSU1AIw=;\n\tb=tYez1Cr4mj9ckl13N5sAnhakTVUAb+vEKzCWDu4GagMkY2T752pZVFZPfM6G3WyC0B\n\tk17fc2UNIl2mlARKQCL/pWV5fO1Iym6jWbEiDHJv+8gyw+swyWe109cn/tVuj1THp0xQ\n\t+V+0eMlk/YcvS9vnWg5HYAa9u9fsI3CFjUOxIUYTysjI4rqQeWMSmrF93CXZiM3IzHpC\n\t3COO3A6hH9MQqX2DCbJlHdZGScr8qGa6FNV9UR272yfTjhbIXsEYY2t7w+DZtSlb2fVq\n\tmEyO6daBHGpVCrzYS9lyv/Wr8oqLw7NZLMzx9FeSbDOGfE+klBpkVT3iM6kJ2Msdn5jv\n\tJe0Q==","X-Gm-Message-State":"AOAM532XTiCLpQc3DKat6FKU31W1R3nuZ+/xgugEyaLXW8bTY0tJswvv\n\tqToGQdKQxRSMMeTeWnUaSOez0w/EFr061Q==","X-Google-Smtp-Source":"ABdhPJxdD05fJXsEkDquC26xcEtnVFivmkjKlP+CUfyV9HMKw89ZVompEQT19BAwRqMxYG+ZwWepuQ==","X-Received":"by 2002:ac2:491e:: with SMTP id\n\tn30mr7351650lfi.395.1600269389395; \n\tWed, 16 Sep 2020 08:16:29 -0700 (PDT)","Date":"Wed, 16 Sep 2020 17:16:28 +0200","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Laurent Pinchart ","Message-ID":"<20200916151628.GH1850958@oden.dyn.berto.se>","References":"<20200916145254.1644-1-laurent.pinchart@ideasonboard.com>\n\t<20200916145254.1644-5-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200916145254.1644-5-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 4/7] qcam: viewfinder_gl: Rename\n\tshader files","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"iso-8859-1\"","Content-Transfer-Encoding":"quoted-printable","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]