From dfadca635682772cf93552642f0585ecfe2c851c Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Mon, 12 Oct 2020 21:59:28 +0300
Subject: 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 <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>
---
src/qcam/assets/shader/YUV.vert | 16 ----------------
src/qcam/assets/shader/identity.vert | 16 ++++++++++++++++
src/qcam/assets/shader/shaders.qrc | 2 +-
src/qcam/viewfinder_gl.cpp | 2 +-
4 files changed, 18 insertions(+), 18 deletions(-)
delete mode 100644 src/qcam/assets/shader/YUV.vert
create mode 100644 src/qcam/assets/shader/identity.vert
(limited to 'src')
diff --git a/src/qcam/assets/shader/YUV.vert b/src/qcam/assets/shader/YUV.vert
deleted file mode 100644
index f38e8045..00000000
--- a/src/qcam/assets/shader/YUV.vert
+++ /dev/null
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1-or-later */
-/*
- * Copyright (C) 2020, Linaro
- *
- * YUV.vert - Vertex shader for YUV to RGB conversion
- */
-
-attribute vec4 vertexIn;
-attribute vec2 textureIn;
-varying vec2 textureOut;
-
-void main(void)
-{
- gl_Position = vertexIn;
- textureOut = textureIn;
-}
diff --git a/src/qcam/assets/shader/identity.vert b/src/qcam/assets/shader/identity.vert
new file mode 100644
index 00000000..6d6f7551
--- /dev/null
+++ b/src/qcam/assets/shader/identity.vert
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/*
+ * Copyright (C) 2020, Linaro
+ *
+ * identity.vert - Identity vertex shader for pixel format conversion
+ */
+
+attribute vec4 vertexIn;
+attribute vec2 textureIn;
+varying vec2 textureOut;
+
+void main(void)
+{
+ gl_Position = vertexIn;
+ textureOut = textureIn;
+}
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;
}
--
cgit v1.2.1