{"id":12691,"url":"https://patchwork.libcamera.org/api/1.1/patches/12691/?format=json","web_url":"https://patchwork.libcamera.org/patch/12691/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210622134652.1279260-8-andrey.konovalov@linaro.org>","date":"2021-06-22T13:46:50","name":"[libcamera-devel,v5,7/9] qcam: viewfinder_gl: set the vertex shader file name in selectFormat()","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"9708f4ffe3827cec396938d4c78e3a21e43fc806","submitter":{"id":25,"url":"https://patchwork.libcamera.org/api/1.1/people/25/?format=json","name":"Andrey Konovalov","email":"andrey.konovalov@linaro.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/12691/mbox/","series":[{"id":2168,"url":"https://patchwork.libcamera.org/api/1.1/series/2168/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2168","date":"2021-06-22T13:46:43","name":"qcam: viewfinder_gl: add RAW8, RAW10P and RAW12P formats","version":5,"mbox":"https://patchwork.libcamera.org/series/2168/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12691/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12691/checks/","tags":{},"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 1E7E2C321B\n\tfor ;\n\tTue, 22 Jun 2021 13:47:24 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D51A660297;\n\tTue, 22 Jun 2021 15:47:23 +0200 (CEST)","from mail-lj1-x22f.google.com (mail-lj1-x22f.google.com\n\t[IPv6:2a00:1450:4864:20::22f])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B5D8368EA3\n\tfor ;\n\tTue, 22 Jun 2021 15:47:21 +0200 (CEST)","by mail-lj1-x22f.google.com with SMTP id d25so2155548lji.7\n\tfor ;\n\tTue, 22 Jun 2021 06:47:21 -0700 (PDT)","from localhost.localdomain ([85.249.44.185])\n\tby smtp.googlemail.com with ESMTPSA id\n\tb19sm163125ljo.37.2021.06.22.06.47.20\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 22 Jun 2021 06:47:20 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=linaro.org header.i=@linaro.org\n\theader.b=\"jyxWbuLj\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=TUbjnIpWP4fKLUmcH2E4fnC7KvY82GsTBNsUS9Q1Ci8=;\n\tb=jyxWbuLjsaLztD6QY8Gau75RzThsmGBscKM37caq55qbluKmw6O1D6Ny/WYz+cfOZ4\n\teEa0msMSaLNRNxH0qtKE8uk9lraML5mh4GEGejcoLS7HpXXcSvEaO6DUAHJrZEEmEofA\n\til2fLXIqeHqn6iGECHiZNIOOEPpcuzV+VqBWGmjR2alk+iWwKEcFAdFjOmhueWaaFV2z\n\thRAsepc4otrvVMMUqZfmOTnVd2/7yPK8tUjw/CnZ+1/XUyDlZRu4hqwLC6bbSkr5DZ7q\n\tG7xxABtq7RG/oLoJDqjCmkBH6TNaWHmmLAPvd/EYsPmMbcq6gtzTzTylFEm5sYHJFZEa\n\tQhQA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=TUbjnIpWP4fKLUmcH2E4fnC7KvY82GsTBNsUS9Q1Ci8=;\n\tb=S8dFzLIc2apteA5dBS5qcRhYUytlNjRcouHd27OHqcBa81f3BWDpZoy4xSZw6uTx+W\n\tzYJMnKFNqyiv9TF/NXhbHtlvlkkOittNWejoMIai/rzRA+rw1UPjCqWDBFLYZbYEXyrH\n\tOnlx+M1Ii/r23Qf3+twN37aHGAr1hzwYGrrxE0BlGpvo/RwaGI0FccVU1VmKqEsA9c9e\n\tArM3l4AYjWzJeZ61PJJ8vwt9Tj8lk5SymqWD8EHcJ38y+MY3ombnBIxJJasStofM4LYD\n\tLZXqHlv9QQxR+zIRZOnWiqt8blJrtC6N1/Ga1l8PB1kHMHe7j4ALqp902kFwXFY6NNRp\n\tC63A==","X-Gm-Message-State":"AOAM530KAqhglNdLc6jWuaLBeo/SSsPNSRt/rcSz3sEWXavqLusxd7Bx\n\tdFQR0Ts2eW/69IP0nFJ1MEE7VEzn4bHCyQ==","X-Google-Smtp-Source":"ABdhPJyRhEiw46BhtJI6raddN8bX31/6Hg0kSN5finJLTQ8Eoe6x26nLVaCLcLvF9MC30E6MVK+o/A==","X-Received":"by 2002:a2e:bc0b:: with SMTP id\n\tb11mr3351501ljf.131.1624369641244; \n\tTue, 22 Jun 2021 06:47:21 -0700 (PDT)","From":"Andrey Konovalov ","To":"libcamera-devel@lists.libcamera.org,\n\tlaurent.pinchart@ideasonboard.com","Date":"Tue, 22 Jun 2021 16:46:50 +0300","Message-Id":"<20210622134652.1279260-8-andrey.konovalov@linaro.org>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20210622134652.1279260-1-andrey.konovalov@linaro.org>","References":"<20210622134652.1279260-1-andrey.konovalov@linaro.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v5 7/9] qcam: viewfinder_gl: set the\n\tvertex shader file name in selectFormat()","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":"morgan@casual-effects.com","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"In preparation to extend the supported formats, make it possible\nto use different vertex fragment files depending on the format.\nMake \"identity.vert\" the default choice.\n\nSigned-off-by: Andrey Konovalov \n---\n src/qcam/viewfinder_gl.cpp | 5 ++++-\n src/qcam/viewfinder_gl.h | 1 +\n 2 files changed, 5 insertions(+), 1 deletion(-)","diff":"diff --git a/src/qcam/viewfinder_gl.cpp b/src/qcam/viewfinder_gl.cpp\nindex a6aa2b44..6d1d80bd 100644\n--- a/src/qcam/viewfinder_gl.cpp\n+++ b/src/qcam/viewfinder_gl.cpp\n@@ -131,6 +131,9 @@ bool ViewFinderGL::selectFormat(const libcamera::PixelFormat &format)\n \t/* Set min/mag filters to GL_LINEAR by default. */\n \ttextureMinMagFilters_ = GL_LINEAR;\n \n+\t/* Use identity.vert as the default vertex shader. */\n+\tvertexShaderFile_ = \":identity.vert\";\n+\n \tfragmentShaderDefines_.clear();\n \n \tswitch (format) {\n@@ -292,7 +295,7 @@ bool ViewFinderGL::createVertexShader()\n \tvertexShader_ = std::make_unique(QOpenGLShader::Vertex, this);\n \n \t/* Compile the vertex shader */\n-\tif (!vertexShader_->compileSourceFile(\":identity.vert\")) {\n+\tif (!vertexShader_->compileSourceFile(vertexShaderFile_)) {\n \t\tqWarning() << \"[ViewFinderGL]:\" << vertexShader_->log();\n \t\treturn false;\n \t}\ndiff --git a/src/qcam/viewfinder_gl.h b/src/qcam/viewfinder_gl.h\nindex 508155b1..bce94c87 100644\n--- a/src/qcam/viewfinder_gl.h\n+++ b/src/qcam/viewfinder_gl.h\n@@ -73,6 +73,7 @@ private:\n \tQOpenGLShaderProgram shaderProgram_;\n \tstd::unique_ptr vertexShader_;\n \tstd::unique_ptr fragmentShader_;\n+\tQString vertexShaderFile_;\n \tQString fragmentShaderFile_;\n \tQStringList fragmentShaderDefines_;\n \n","prefixes":["libcamera-devel","v5","7/9"]}