[{"id":12550,"web_url":"https://patchwork.libcamera.org/comment/12550/","msgid":"<20200916150426.GG1850958@oden.dyn.berto.se>","date":"2020-09-16T15:04:26","subject":"Re: [libcamera-devel] [PATCH 3/7] qcam: viewfinder_gl: Hardcode the\n\tvertex shader file name","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:50 +0300, Laurent Pinchart wrote:\n> The GL renderer uses the same vertex shader for all formats. Hardcode\n> the file name instead of storing it in a member variable.\n> \n> Signed-off-by: Laurent Pinchart \n\nReviewed-by: Niklas Söderlund \n\n> ---\n> src/qcam/viewfinder_gl.cpp | 10 +---------\n> src/qcam/viewfinder_gl.h | 3 +--\n> 2 files changed, 2 insertions(+), 11 deletions(-)\n> \n> diff --git a/src/qcam/viewfinder_gl.cpp b/src/qcam/viewfinder_gl.cpp\n> index 18ebe46fe2f9..76e4a900a25a 100644\n> --- a/src/qcam/viewfinder_gl.cpp\n> +++ b/src/qcam/viewfinder_gl.cpp\n> @@ -101,49 +101,41 @@ bool ViewFinderGL::selectFormat(const libcamera::PixelFormat &format)\n> \tcase libcamera::formats::NV12:\n> \t\thorzSubSample_ = 2;\n> \t\tvertSubSample_ = 2;\n> -\t\tvertexShaderSrc_ = \":NV_vertex_shader.glsl\";\n> \t\tfragmentShaderSrc_ = \":NV_2_planes_UV_f.glsl\";\n> \t\tbreak;\n> \tcase libcamera::formats::NV21:\n> \t\thorzSubSample_ = 2;\n> \t\tvertSubSample_ = 2;\n> -\t\tvertexShaderSrc_ = \":NV_vertex_shader.glsl\";\n> \t\tfragmentShaderSrc_ = \":NV_2_planes_VU_f.glsl\";\n> \t\tbreak;\n> \tcase libcamera::formats::NV16:\n> \t\thorzSubSample_ = 2;\n> \t\tvertSubSample_ = 1;\n> -\t\tvertexShaderSrc_ = \":NV_vertex_shader.glsl\";\n> \t\tfragmentShaderSrc_ = \":NV_2_planes_UV_f.glsl\";\n> \t\tbreak;\n> \tcase libcamera::formats::NV61:\n> \t\thorzSubSample_ = 2;\n> \t\tvertSubSample_ = 1;\n> -\t\tvertexShaderSrc_ = \":NV_vertex_shader.glsl\";\n> \t\tfragmentShaderSrc_ = \":NV_2_planes_VU_f.glsl\";\n> \t\tbreak;\n> \tcase libcamera::formats::NV24:\n> \t\thorzSubSample_ = 1;\n> \t\tvertSubSample_ = 1;\n> -\t\tvertexShaderSrc_ = \":NV_vertex_shader.glsl\";\n> \t\tfragmentShaderSrc_ = \":NV_2_planes_UV_f.glsl\";\n> \t\tbreak;\n> \tcase libcamera::formats::NV42:\n> \t\thorzSubSample_ = 1;\n> \t\tvertSubSample_ = 1;\n> -\t\tvertexShaderSrc_ = \":NV_vertex_shader.glsl\";\n> \t\tfragmentShaderSrc_ = \":NV_2_planes_VU_f.glsl\";\n> \t\tbreak;\n> \tcase libcamera::formats::YUV420:\n> \t\thorzSubSample_ = 2;\n> \t\tvertSubSample_ = 2;\n> -\t\tvertexShaderSrc_ = \":NV_vertex_shader.glsl\";\n> \t\tfragmentShaderSrc_ = \":NV_3_planes_f.glsl\";\n> \t\tbreak;\n> \tcase libcamera::formats::YVU420:\n> \t\thorzSubSample_ = 2;\n> \t\tvertSubSample_ = 2;\n> -\t\tvertexShaderSrc_ = \":NV_vertex_shader.glsl\";\n> \t\tfragmentShaderSrc_ = \":NV_3_planes_f.glsl\";\n> \t\tbreak;\n> \tdefault:\n> @@ -162,7 +154,7 @@ bool ViewFinderGL::createVertexShader()\n> \tvertexShader_ = new QOpenGLShader(QOpenGLShader::Vertex, this);\n> \n> \t/* Compile the vertex shader */\n> -\tif (!vertexShader_->compileSourceFile(vertexShaderSrc_)) {\n> +\tif (!vertexShader_->compileSourceFile(\":NV_vertex_shader.glsl\")) {\n> \t\tqWarning() << \"[ViewFinderGL]:\" << vertexShader_->log();\n> \t\treturn false;\n> \t}\n> diff --git a/src/qcam/viewfinder_gl.h b/src/qcam/viewfinder_gl.h\n> index 825af1c13cb7..7675d0a06351 100644\n> --- a/src/qcam/viewfinder_gl.h\n> +++ b/src/qcam/viewfinder_gl.h\n> @@ -73,9 +73,8 @@ private:\n> \t/* Vertex buffer */\n> \tQOpenGLBuffer vertexBuffer_;\n> \n> -\t/* Fragment and Vertex shader file name */\n> +\t/* Fragment shader file name */\n> \tQString fragmentShaderSrc_;\n> -\tQString vertexShaderSrc_;\n> \n> \t/* YUV texture planars and parameters */\n> \tGLuint textureUniformU_;\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 6C083C3B5B\n\tfor ;\n\tWed, 16 Sep 2020 15:04:29 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1150461E2B;\n\tWed, 16 Sep 2020 17:04:29 +0200 (CEST)","from mail-lj1-x243.google.com (mail-lj1-x243.google.com\n\t[IPv6:2a00:1450:4864:20::243])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 95E4D60533\n\tfor ;\n\tWed, 16 Sep 2020 17:04:27 +0200 (CEST)","by mail-lj1-x243.google.com with SMTP id u4so6170277ljd.10\n\tfor ;\n\tWed, 16 Sep 2020 08:04:27 -0700 (PDT)","from localhost (h-209-203.A463.priv.bahnhof.se. [155.4.209.203])\n\tby smtp.gmail.com with ESMTPSA id\n\tu11sm5363697ljh.17.2020.09.16.08.04.26\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 16 Sep 2020 08:04:26 -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=\"RKsUc3Zo\"; 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=Uj6pprIBxtD/fEKE9irSuBjV7+s1EP7QOCWUadKiHIM=;\n\tb=RKsUc3Zo0MdOEGecksZ26bq5yiFB3lWo721fC6Oq1MQD5rl6aCyzmEQ09mUg+2mrKw\n\tJDqDQv4BldHcH3GE7gesVyoAgHL2+BaYjkf33kE4nqPOxvV5O1COUi1GmhKjHwhiAy5V\n\t0sAG3tsqXz41CWBNvaF0x7d0afvAWETizuO14+3F+yV88AK/Bt0y0XkWugUduqVr0iwb\n\tOSfG0mzJcUsf+czZBSYJqluQBeKZAP1VXQ2f9flmDUYCuPoRo8br9Wb5L1nHf7dpRh1N\n\tQF3vjkHt8X6tD/8bR8IzSLMwlPhnfV7yNcnZZwpocE2WhRZcBT4fhmBj3eZNxRvRFek1\n\tpfeQ==","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=Uj6pprIBxtD/fEKE9irSuBjV7+s1EP7QOCWUadKiHIM=;\n\tb=QO5rYQ4Fq+ONyc/iHNBJ9sRsbUr9u2oWPMB1vGZnCXpjhU8EaHdmRgMboA0vMSsmuB\n\tBgStKtpaVzgZ3PmKkMZXougAo+a2klr/GMypO2rFaHQU4cxI0V+ZdAjQuJva6w0xsLWW\n\tJB17cOOhR0oqEE9iosrDWohyi1XGT31G3C6o8I+kmGVqXKqJg3pHUxz9h84yuKmA0DD6\n\tSX52hEpo087V3nqrRApdmNQqW1i8EGKxsk0ZciBBahaCtcQ+JUYiJ8pWqxBMbEuwGPRz\n\t8YuUC5XL0EEEsA2uK3X7ebJG/1Jk1YJTxJtUmI9Yp4dWSry6xnpVqcUNMTGTpbwOo6gg\n\t+c2g==","X-Gm-Message-State":"AOAM530aIDK2A4j1qTsfQFAptVgYt3/1uP0rq9JHc+O7gNgJBWM2vL49\n\tFzsREWt+Tb1ElpFOueXB8b2cmg==","X-Google-Smtp-Source":"ABdhPJxGqaeOEfWI6RRQG/r89pRravQnpER2gLb9DWq5QBS4AfBOFHb2uAzIlwvk81u9tmT6+RFO+Q==","X-Received":"by 2002:a2e:818b:: with SMTP id e11mr8790566ljg.0.1600268666980; \n\tWed, 16 Sep 2020 08:04:26 -0700 (PDT)","Date":"Wed, 16 Sep 2020 17:04:26 +0200","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Laurent Pinchart ","Message-ID":"<20200916150426.GG1850958@oden.dyn.berto.se>","References":"<20200916145254.1644-1-laurent.pinchart@ideasonboard.com>\n\t<20200916145254.1644-4-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200916145254.1644-4-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 3/7] qcam: viewfinder_gl: Hardcode the\n\tvertex shader file name","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\" "}}]