[libcamera-devel,4/7] qcam: viewfinder_gl: Rename YUV.vert to identity.vert
diff mbox series

Message ID 20201103155025.5948-5-laurent.pinchart@ideasonboard.com
State Accepted
Headers show
Series
  • qcam: Miscellaneous shaders cleanups and RGB support
Related show

Commit Message

Laurent Pinchart Nov. 3, 2020, 3:50 p.m. UTC 
In preparation for RGB formats support, rename the identity vertex
shader from YUV.vert to identify.vert.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 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%)

Comments

Andrey Konovalov Nov. 3, 2020, 6:32 p.m. UTC | #1 
Hi Laurent,

Thank you for the patch!

On 03.11.2020 18:50, Laurent Pinchart wrote:
> In preparation for RGB formats support, rename the identity vertex
> shader from YUV.vert to identify.vert.

- s/identify/identity in the above line

Yes, identity is a better name for this shader.

Reviewed-by: Andrey Konovalov <andrey.konovalov@linaro.org>

Thanks,
Andrey

> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
>   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 @@
>   <!-- 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 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>(QOpenGLShader::Vertex, this);
>   
>   	/* Compile the vertex shader */
> -	if (!vertexShader_->compileSourceFile(":YUV.vert")) {
> +	if (!vertexShader_->compileSourceFile(":identity.vert")) {
>   		qWarning() << "[ViewFinderGL]:" << vertexShader_->log();
>   		return false;
>   	}
>
Kieran Bingham Nov. 3, 2020, 11:02 p.m. UTC | #2 
On 03/11/2020 18:32, Andrey Konovalov wrote:
> Hi Laurent,
> 
> Thank you for the patch!
> 
> On 03.11.2020 18:50, Laurent Pinchart wrote:
>> In preparation for RGB formats support, rename the identity vertex
>> shader from YUV.vert to identify.vert.
> 
> - s/identify/identity in the above line
> 
> Yes, identity is a better name for this shader.
> 
> Reviewed-by: Andrey Konovalov <andrey.konovalov@linaro.org>

and then
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

> 
> Thanks,
> Andrey
> 
>> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>> ---
>>   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 @@
>>   <!-- 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 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>(QOpenGLShader::Vertex, this);
>>         /* Compile the vertex shader */
>> -    if (!vertexShader_->compileSourceFile(":YUV.vert")) {
>> +    if (!vertexShader_->compileSourceFile(":identity.vert")) {
>>           qWarning() << "[ViewFinderGL]:" << vertexShader_->log();
>>           return false;
>>       }
>>
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel@lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel
Niklas Söderlund Nov. 6, 2020, 12:47 a.m. UTC | #3 
Hi Laurent,

Thanks for your work.

On 2020-11-03 23:02:11 +0000, Kieran Bingham wrote:
> 
> 
> On 03/11/2020 18:32, Andrey Konovalov wrote:
> > Hi Laurent,
> > 
> > Thank you for the patch!
> > 
> > On 03.11.2020 18:50, Laurent Pinchart wrote:
> >> In preparation for RGB formats support, rename the identity vertex
> >> shader from YUV.vert to identify.vert.
> > 
> > - s/identify/identity in the above line
> > 
> > Yes, identity is a better name for this shader.
> > 
> > Reviewed-by: Andrey Konovalov <andrey.konovalov@linaro.org>
> 
> and then
> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

and then and then

Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>

> 
> > 
> > Thanks,
> > Andrey
> > 
> >> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> >> ---
> >>   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 @@
> >>   <!-- 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 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>(QOpenGLShader::Vertex, this);
> >>         /* Compile the vertex shader */
> >> -    if (!vertexShader_->compileSourceFile(":YUV.vert")) {
> >> +    if (!vertexShader_->compileSourceFile(":identity.vert")) {
> >>           qWarning() << "[ViewFinderGL]:" << vertexShader_->log();
> >>           return false;
> >>       }
> >>
> > _______________________________________________
> > libcamera-devel mailing list
> > libcamera-devel@lists.libcamera.org
> > https://lists.libcamera.org/listinfo/libcamera-devel
> 
> -- 
> Regards
> --
> Kieran
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel@lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel

Patch
diff mbox series 

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 @@ 
 <!-- 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 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>(QOpenGLShader::Vertex, this);
 
 	/* Compile the vertex shader */
-	if (!vertexShader_->compileSourceFile(":YUV.vert")) {
+	if (!vertexShader_->compileSourceFile(":identity.vert")) {
 		qWarning() << "[ViewFinderGL]:" << vertexShader_->log();
 		return false;
 	}