@@ -111,7 +111,6 @@ int GpuIspShaderPassDemosiac::getShaderVariableLocations(void)
textureUniformBayerFirstRed_ = glGetUniformLocation(programId_, "tex_bayer_first_red");
textureUniformProjMatrix_ = glGetUniformLocation(programId_, "proj_matrix");
textureUniformBayerDataIn_ = glGetUniformLocation(programId_, "tex_y");
- textureUniformStep_ = glGetUniformLocation(programId_, "tex_step");
textureUniformSize_ = glGetUniformLocation(programId_, "tex_size");
LOG(GpuShaderDemosiac, Debug) << "vertexIn " << attributeVertex_ << " textureIn " << attributeTexture_
@@ -137,8 +136,6 @@ void GpuIspShaderPassDemosiac::setShaderVariableValues(eGLImage &eglImageIn, con
GLfloat firstRed[] = { firstRed_x_, firstRed_y_ };
GLfloat imgSize[] = { (GLfloat)passInputCfg_.size.width,
(GLfloat)passInputCfg_.size.height };
- GLfloat Step[] = { static_cast<float>(bytesPerPixel_) / (passInputCfg_.stride - 1),
- 1.0f / (passInputCfg_.size.height - 1) };
GLfloat Stride = (GLfloat)passInputCfg_.size.width / (shaderStridePixels_ / bytesPerPixel_);
/*
* Scale the output size from the native size the algorithm produces for
@@ -195,7 +192,6 @@ void GpuIspShaderPassDemosiac::setShaderVariableValues(eGLImage &eglImageIn, con
*/
glUniform2fv(textureUniformBayerFirstRed_, 1, firstRed);
glUniform2fv(textureUniformSize_, 1, imgSize);
- glUniform2fv(textureUniformStep_, 1, Step);
glUniform1f(textureUniformStrideFactor_, Stride);
glUniformMatrix4fv(textureUniformProjMatrix_, 1, GL_FALSE, projMatrix);
@@ -209,8 +205,6 @@ void GpuIspShaderPassDemosiac::setShaderVariableValues(eGLImage &eglImageIn, con
<< " firstRed.y " << firstRed[1]
<< " textureUniformSize_.width " << imgSize[0]
<< " textureUniformSize_.height " << imgSize[1]
- << " textureUniformStep_.x " << Step[0]
- << " textureUniformStep_.y " << Step[1]
<< " textureUniformStrideFactor_ " << Stride
<< " textureUniformProjMatrix_ " << textureUniformProjMatrix_;
@@ -44,7 +44,6 @@ public:
const char *name() const override { return "GpuIspShaderPassDemosiac"; }
private:
/* Shader parameters */
- GLint textureUniformStep_;
GLint textureUniformSize_;
/* Per-frame AWB gains */
The fragment shader associated with this class no longer depends on tex_step as input. Thus we can shed the supporting infrastructure feeding it. Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> --- .../software_isp/gpu_pipeline_shader_pass_demosiac.cpp | 6 ------ .../software_isp/gpu_pipeline_shader_pass_demosiac.h | 1 - 2 files changed, 7 deletions(-)