PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcam: viewfinder_gl: Rename shader files

Browse Source 
Rename shader files to prepare for packed YUYV support:

- The NV prefix isn't a good match for packed (or for 3-planar) formats,
  replace it with a YUV prefix
- Use .frag and .vert extensions to differentiate between fragment and
  vertex shaders

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
This commit is contained in:
Laurent Pinchart
2020-09-16 16:23:27 +03:00
parent 079afd17e7
commit 440028d6c9
6 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/qcam/assets/shader/NV_vertex_shader.glsl → src/qcam/assets/shader/YUV.vert
+1 -1
View File
@@ -2,7 +2,7 @@
/*
* Copyright (C) 2020, Linaro
*
* NV_vertex_shader.glsl - Vertex shader code for NV family
* YUV.vert - Vertex shader for YUV to RGB conversion
*/
attribute vec4 vertexIn;
src/qcam/assets/shader/NV_2_planes_UV_f.glsl → src/qcam/assets/shader/YUV_2_planes_UV.frag
+1 -1
View File
@@ -2,7 +2,7 @@
/*
* Copyright (C) 2020, Linaro
*
* NV_2_planes_UV_f.glsl - Fragment shader code for NV12, NV16 and NV24 formats
* YUV_2_planes_UV.frag - Fragment shader code for NV12, NV16 and NV24 formats
*/
#ifdef GL_ES
src/qcam/assets/shader/NV_2_planes_VU_f.glsl → src/qcam/assets/shader/YUV_2_planes_VU.frag
+1 -1
View File
@@ -2,7 +2,7 @@
/*
* Copyright (C) 2020, Linaro
*
* NV_2_planes_VU_f.glsl - Fragment shader code for NV21, NV61 and NV42 formats
* YUV_2_planes_VU.frag - Fragment shader code for NV21, NV61 and NV42 formats
*/
#ifdef GL_ES
src/qcam/assets/shader/NV_3_planes_f.glsl → src/qcam/assets/shader/YUV_3_planes.frag
+1 -1
View File
@@ -2,7 +2,7 @@
/*
* Copyright (C) 2020, Linaro
*
* NV_3_planes_UV_f.glsl - Fragment shader code for YUV420 format
* YUV_3_planes_UV.frag - Fragment shader code for YUV420 format
*/
#ifdef GL_ES
src/qcam/assets/shader/shaders.qrc
+4 -4
View File
@@ -1,9 +1,9 @@
<!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
<!DOCTYPE RCC><RCC version="1.0">
<qresource>
<file>NV_vertex_shader.glsl</file>
<file>NV_2_planes_UV_f.glsl</file>
<file>NV_2_planes_VU_f.glsl</file>
<file>NV_3_planes_f.glsl</file>
<file>YUV.vert</file>
<file>YUV_2_planes_UV.frag</file>
<file>YUV_2_planes_VU.frag</file>
<file>YUV_3_planes.frag</file>
</qresource>
</RCC>
src/qcam/viewfinder_gl.cpp
+9 -9
View File
@@ -101,42 +101,42 @@ bool ViewFinderGL::selectFormat(const libcamera::PixelFormat &format)
case libcamera::formats::NV12:
horzSubSample_ = 2;
vertSubSample_ = 2;
fragmentShaderSrc_ = ":NV_2_planes_UV_f.glsl";
fragmentShaderSrc_ = ":YUV_2_planes_UV.frag";
break;
case libcamera::formats::NV21:
horzSubSample_ = 2;
vertSubSample_ = 2;
fragmentShaderSrc_ = ":NV_2_planes_VU_f.glsl";
fragmentShaderSrc_ = ":YUV_2_planes_VU.frag";
break;
case libcamera::formats::NV16:
horzSubSample_ = 2;
vertSubSample_ = 1;
fragmentShaderSrc_ = ":NV_2_planes_UV_f.glsl";
fragmentShaderSrc_ = ":YUV_2_planes_UV.frag";
break;
case libcamera::formats::NV61:
horzSubSample_ = 2;
vertSubSample_ = 1;
fragmentShaderSrc_ = ":NV_2_planes_VU_f.glsl";
fragmentShaderSrc_ = ":YUV_2_planes_VU.frag";
break;
case libcamera::formats::NV24:
horzSubSample_ = 1;
vertSubSample_ = 1;
fragmentShaderSrc_ = ":NV_2_planes_UV_f.glsl";
fragmentShaderSrc_ = ":YUV_2_planes_UV.frag";
break;
case libcamera::formats::NV42:
horzSubSample_ = 1;
vertSubSample_ = 1;
fragmentShaderSrc_ = ":NV_2_planes_VU_f.glsl";
fragmentShaderSrc_ = ":YUV_2_planes_VU.frag";
break;
case libcamera::formats::YUV420:
horzSubSample_ = 2;
vertSubSample_ = 2;
fragmentShaderSrc_ = ":NV_3_planes_f.glsl";
fragmentShaderSrc_ = ":YUV_3_planes.frag";
break;
case libcamera::formats::YVU420:
horzSubSample_ = 2;
vertSubSample_ = 2;
fragmentShaderSrc_ = ":NV_3_planes_f.glsl";
fragmentShaderSrc_ = ":YUV_3_planes.frag";
break;
default:
ret = false;
@@ -154,7 +154,7 @@ bool ViewFinderGL::createVertexShader()
vertexShader_ = new QOpenGLShader(QOpenGLShader::Vertex, this);
/* Compile the vertex shader */
if (!vertexShader_->compileSourceFile(":NV_vertex_shader.glsl")) {
if (!vertexShader_->compileSourceFile(":YUV.vert")) {
qWarning() << "[ViewFinderGL]:" << vertexShader_->log();
return false;
}