From dfadca635682772cf93552642f0585ecfe2c851c Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Mon, 12 Oct 2020 21:59:28 +0300 Subject: [PATCH] qcam: viewfinder_gl: Rename YUV.vert to identity.vert MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In preparation for RGB formats support, rename the identity vertex shader from YUV.vert to identity.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 f38e8045..6d6f7551 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 857ed9fd..86310914 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 dc35d4fd..110f0fa6 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; }