From patchwork Tue Nov 3 15:50:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 10325 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id C05B9BDB89 for ; Tue, 3 Nov 2020 15:51:23 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 55CB162C3D; Tue, 3 Nov 2020 16:51:23 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="KuZFXfJo"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 74F7362C42 for ; Tue, 3 Nov 2020 16:51:20 +0100 (CET) Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id EB60AB9C; Tue, 3 Nov 2020 16:51:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1604418680; bh=5Ykvp841gWtzzBknkCyMAXPW4JBMsUVhXuLOGpoSK6g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KuZFXfJobQyuQ2x1Fe8YcGG1c7IbafvzB/iyjgin6NXGSoaJ4ncqAazuKKPq0v60p ZZF72kFUKYG28Nb1nnIS553mjgk5zn/yDih93lg9fa2z9JK+IX+BEACC25Aa8zXeio +Rwd1XII4FMcNu9TXZuc+VgsnLCcbr5YElwIBUCM= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Tue, 3 Nov 2020 17:50:22 +0200 Message-Id: <20201103155025.5948-5-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201103155025.5948-1-laurent.pinchart@ideasonboard.com> References: <20201103155025.5948-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 4/7] qcam: viewfinder_gl: Rename YUV.vert to identity.vert X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" In preparation for RGB formats support, rename the identity vertex shader from YUV.vert to identify.vert. Signed-off-by: Laurent Pinchart Reviewed-by: Andrey Konovalov Reviewed-by: Kieran Bingham Reviewed-by: Niklas Söderlund --- src/qcam/assets/shader/{YUV.vert => identity.vert} | 2 +- src/qcam/assets/shader/shaders.qrc | 2 +- src/qcam/viewfinder_gl.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename src/qcam/assets/shader/{YUV.vert => identity.vert} (77%) diff --git a/src/qcam/assets/shader/YUV.vert b/src/qcam/assets/shader/identity.vert similarity index 77% rename from src/qcam/assets/shader/YUV.vert rename to src/qcam/assets/shader/identity.vert index f38e8045db89..6d6f7551017e 100644 --- a/src/qcam/assets/shader/YUV.vert +++ b/src/qcam/assets/shader/identity.vert @@ -2,7 +2,7 @@ /* * Copyright (C) 2020, Linaro * - * YUV.vert - Vertex shader for YUV to RGB conversion + * identity.vert - Identity vertex shader for pixel format conversion */ attribute vec4 vertexIn; diff --git a/src/qcam/assets/shader/shaders.qrc b/src/qcam/assets/shader/shaders.qrc index 857ed9fd5cde..863109146281 100644 --- a/src/qcam/assets/shader/shaders.qrc +++ b/src/qcam/assets/shader/shaders.qrc @@ -1,9 +1,9 @@ - YUV.vert YUV_2_planes.frag YUV_3_planes.frag YUV_packed.frag + identity.vert diff --git a/src/qcam/viewfinder_gl.cpp b/src/qcam/viewfinder_gl.cpp index dc35d4fd8505..110f0fa673df 100644 --- a/src/qcam/viewfinder_gl.cpp +++ b/src/qcam/viewfinder_gl.cpp @@ -191,7 +191,7 @@ bool ViewFinderGL::createVertexShader() vertexShader_ = std::make_unique(QOpenGLShader::Vertex, this); /* Compile the vertex shader */ - if (!vertexShader_->compileSourceFile(":YUV.vert")) { + if (!vertexShader_->compileSourceFile(":identity.vert")) { qWarning() << "[ViewFinderGL]:" << vertexShader_->log(); return false; }