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

qcam: viewfinder_gl: Don't store texture IDs in class members

Browse Source 
The texture IDs can easily and cheaply be retrieved from the textures,
there's no need to store them in class members.

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-13 03:09:52 +03:00
parent 11abf52a8a
commit 52f2581709
2 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/qcam/viewfinder_gl.cpp
View File

@@ -229,15 +229,12 @@ bool ViewFinderGL::createFragmentShader()
if (!textureV_.isCreated())
textureV_.create();
id_y_ = textureY_.textureId();
id_u_ = textureU_.textureId();
id_v_ = textureV_.textureId();
return true;
}
void ViewFinderGL::configureTexture(unsigned int id)
void ViewFinderGL::configureTexture(QOpenGLTexture &texture)
{
glBindTexture(GL_TEXTURE_2D, id);
glBindTexture(GL_TEXTURE_2D, texture.textureId());
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
@@ -303,7 +300,7 @@ void ViewFinderGL::doRender()
case libcamera::formats::NV42:
/* Activate texture Y */
glActiveTexture(GL_TEXTURE0);
configureTexture(id_y_);
configureTexture(textureY_);
glTexImage2D(GL_TEXTURE_2D,
0,
GL_RED,
@@ -317,7 +314,7 @@ void ViewFinderGL::doRender()
/* Activate texture UV/VU */
glActiveTexture(GL_TEXTURE1);
configureTexture(id_u_);
configureTexture(textureU_);
glTexImage2D(GL_TEXTURE_2D,
0,
GL_RG,
@@ -333,7 +330,7 @@ void ViewFinderGL::doRender()
case libcamera::formats::YUV420:
/* Activate texture Y */
glActiveTexture(GL_TEXTURE0);
configureTexture(id_y_);
configureTexture(textureY_);
glTexImage2D(GL_TEXTURE_2D,
0,
GL_RED,
@@ -347,7 +344,7 @@ void ViewFinderGL::doRender()
/* Activate texture U */
glActiveTexture(GL_TEXTURE1);
configureTexture(id_u_);
configureTexture(textureU_);
glTexImage2D(GL_TEXTURE_2D,
0,
GL_RED,
@@ -361,7 +358,7 @@ void ViewFinderGL::doRender()
/* Activate texture V */
glActiveTexture(GL_TEXTURE2);
configureTexture(id_v_);
configureTexture(textureV_);
glTexImage2D(GL_TEXTURE_2D,
0,
GL_RED,
@@ -377,7 +374,7 @@ void ViewFinderGL::doRender()
case libcamera::formats::YVU420:
/* Activate texture Y */
glActiveTexture(GL_TEXTURE0);
configureTexture(id_y_);
configureTexture(textureY_);
glTexImage2D(GL_TEXTURE_2D,
0,
GL_RED,
@@ -391,7 +388,7 @@ void ViewFinderGL::doRender()
/* Activate texture V */
glActiveTexture(GL_TEXTURE2);
configureTexture(id_v_);
configureTexture(textureV_);
glTexImage2D(GL_TEXTURE_2D,
0,
GL_RED,
@@ -405,7 +402,7 @@ void ViewFinderGL::doRender()
/* Activate texture U */
glActiveTexture(GL_TEXTURE1);
configureTexture(id_u_);
configureTexture(textureU_);
glTexImage2D(GL_TEXTURE_2D,
0,
GL_RED,

5
src/qcam/viewfinder_gl.h
View File

@@ -53,7 +53,7 @@ protected:
private:
bool selectFormat(const libcamera::PixelFormat &format);
void configureTexture(unsigned int id);
void configureTexture(QOpenGLTexture &texture);
bool createFragmentShader();
bool createVertexShader();
void removeShader();
@@ -78,9 +78,6 @@ private:
QString vertexShaderSrc_;
/* YUV texture planars and parameters */
GLuint id_u_;
GLuint id_v_;
GLuint id_y_;
GLuint textureUniformU_;
GLuint textureUniformV_;
GLuint textureUniformY_;