From aa31f8ac9787e173aea239e5710ffc04cdd79008 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Fri, 7 Aug 2020 22:46:07 +1000 Subject: [PATCH] fixed shadowed parameter --- app/widget/scope/histogram/histogram.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/widget/scope/histogram/histogram.cpp b/app/widget/scope/histogram/histogram.cpp index faa546d06..e89918c06 100644 --- a/app/widget/scope/histogram/histogram.cpp +++ b/app/widget/scope/histogram/histogram.cpp @@ -91,16 +91,16 @@ OpenGLShaderPtr HistogramScope::CreateShader() OpenGLShaderPtr HistogramScope::CreateSecondaryShader() { - OpenGLShaderPtr pipeline_secondary_ = OpenGLShader::Create(); + OpenGLShaderPtr shader = OpenGLShader::Create(); - pipeline_secondary_->create(); - pipeline_secondary_->addShaderFromSourceCode(QOpenGLShader::Vertex, + shader->create(); + shader->addShaderFromSourceCode(QOpenGLShader::Vertex, Node::ReadFileAsString(":/shaders/rgbhistogram.vert")); - pipeline_secondary_->addShaderFromSourceCode(QOpenGLShader::Fragment, + shader->addShaderFromSourceCode(QOpenGLShader::Fragment, Node::ReadFileAsString(":/shaders/rgbhistogram_secondary.frag")); - pipeline_secondary_->link(); + shader->link(); - return pipeline_secondary_; + return shader; } void HistogramScope::DrawScope()