From 35236988b7bc489b7683019db89636d4030db1ce Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 7 Jun 2021 18:31:11 +0400 Subject: [PATCH] Remove redundant Uniform(QColor) helper. --- ui/gl/gl_math.cpp | 8 -------- ui/gl/gl_math.h | 1 - ui/gl/gl_primitives.cpp | 4 ++-- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/ui/gl/gl_math.cpp b/ui/gl/gl_math.cpp index 98fc9fc..92da4cc 100644 --- a/ui/gl/gl_math.cpp +++ b/ui/gl/gl_math.cpp @@ -20,14 +20,6 @@ QVector4D Uniform(const Rect &rect) { return QVector4D(rect.x(), rect.y(), rect.width(), rect.height()); } -QVector4D Uniform(const QColor &color) { - return QVector4D( - color.redF(), - color.greenF(), - color.blueF(), - color.alphaF()); -} - QSizeF Uniform(QSize size) { return size; } diff --git a/ui/gl/gl_math.h b/ui/gl/gl_math.h index cc35d65..b6b1bd2 100644 --- a/ui/gl/gl_math.h +++ b/ui/gl/gl_math.h @@ -73,7 +73,6 @@ private: [[nodiscard]] QVector4D Uniform(const QRect &rect, float factor); [[nodiscard]] QVector4D Uniform(const Rect &rect); -[[nodiscard]] QVector4D Uniform(const QColor &color); [[nodiscard]] QSizeF Uniform(QSize size); [[nodiscard]] Rect TransformRect( diff --git a/ui/gl/gl_primitives.cpp b/ui/gl/gl_primitives.cpp index 599b9f9..f038cf4 100644 --- a/ui/gl/gl_primitives.cpp +++ b/ui/gl/gl_primitives.cpp @@ -41,7 +41,7 @@ void FillTriangles( buffer->bind(); buffer->allocate(coords.data(), coords.size() * sizeof(GLfloat)); - program->setUniformValue("s_color", Uniform(color)); + program->setUniformValue("s_color", color); GLint position = program->attributeLocation("position"); f.glVertexAttribPointer( @@ -71,7 +71,7 @@ void FillRectangle( return reinterpret_cast( (skipVertices * 4 + elements) * sizeof(GLfloat)); }; - program->setUniformValue("s_color", Uniform(color)); + program->setUniformValue("s_color", color); GLint position = program->attributeLocation("position"); f.glVertexAttribPointer(