summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-10-12 21:59:28 +0300
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-11-07 19:25:24 +0200
commitdfadca635682772cf93552642f0585ecfe2c851c (patch)
tree747a0f70e90b36a40db5574cf6b745c456484750
parent99f72137e5f7f44298346415167dd603f44b9ca2 (diff)
qcam: viewfinder_gl: Rename YUV.vert to identity.vert
In preparation for RGB formats support, rename the identity vertex shader from YUV.vert to identity.vert. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Andrey Konovalov <andrey.konovalov@linaro.org> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
-rw-r--r--src/qcam/assets/shader/identity.vert (renamed from src/qcam/assets/shader/YUV.vert)2
-rw-r--r--src/qcam/assets/shader/shaders.qrc2
-rw-r--r--src/qcam/viewfinder_gl.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/qcam/assets/shader/YUV.vert b/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 @@
<!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
<!DOCTYPE RCC><RCC version="1.0">
<qresource>
- <file>YUV.vert</file>
<file>YUV_2_planes.frag</file>
<file>YUV_3_planes.frag</file>
<file>YUV_packed.frag</file>
+ <file>identity.vert</file>
</qresource>
</RCC>
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>(QOpenGLShader::Vertex, this);
/* Compile the vertex shader */
- if (!vertexShader_->compileSourceFile(":YUV.vert")) {
+ if (!vertexShader_->compileSourceFile(":identity.vert")) {
qWarning() << "[ViewFinderGL]:" << vertexShader_->log();
return false;
}