use vec4 for color (and use alpha component instead of hardcoded valu…

…e), added missing precision
m0dB · Oct 20, 2023 · 9664d41 · 9664d41
1 parent 599c8cc
commit 9664d41
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/src/shaders/rgbashader.cpp b/src/shaders/rgbashader.cpp
@@ -4,7 +4,7 @@ using namespace mixxx;
 
 void RGBAShader::init() {
     QString vertexShaderCode = QStringLiteral(R"--(
-uniform mat4 matrix;
+uniform highp mat4 matrix;
 attribute highp vec4 position; // use vec4 here (will be padded) for matrix multiplication
 attribute highp vec4 color;
 varying highp vec4 vColor;

diff --git a/src/shaders/rgbshader.cpp b/src/shaders/rgbshader.cpp
@@ -4,7 +4,7 @@ using namespace mixxx;
 
 void RGBShader::init() {
     QString vertexShaderCode = QStringLiteral(R"--(
-uniform mat4 matrix;
+uniform highp mat4 matrix;
 attribute highp vec4 position; // use vec4 here (will be padded) for matrix multiplication
 attribute highp vec3 color;
 varying highp vec3 vColor;

diff --git a/src/shaders/unicolorshader.cpp b/src/shaders/unicolorshader.cpp
@@ -4,7 +4,7 @@ using namespace mixxx;
 
 void UnicolorShader::init() {
     QString vertexShaderCode = QStringLiteral(R"--(
-uniform mat4 matrix;
+uniform highp mat4 matrix;
 attribute highp vec4 position; // use vec4 here (will be padded) for matrix multiplication
 void main()
 {

diff --git a/src/shaders/vinylqualityshader.cpp b/src/shaders/vinylqualityshader.cpp
@@ -4,7 +4,7 @@ using namespace mixxx;
 
 void VinylQualityShader::init() {
     QString vertexShaderCode = QStringLiteral(R"--(
-uniform mat4 matrix;
+uniform highp mat4 matrix;
 attribute highp vec4 position; // use vec4 here (will be padded) for matrix multiplication
 attribute highp vec2 texcoord;
 varying highp vec2 vTexcoord;
@@ -17,11 +17,11 @@ void main()
 
     QString fragmentShaderCode = QStringLiteral(R"--(
 uniform sampler2D texture;
-uniform highp vec3 color;
+uniform highp vec4 color;
 varying highp vec2 vTexcoord;
 void main()
 {
-    gl_FragColor = vec4(color, texture2D(texture, vTexcoord) * 0.75);
+    gl_FragColor = vec4(color.xyz, texture2D(texture, vTexcoord) * color.w);
 }
 )--");
 

diff --git a/src/widget/wspinnyglsl.cpp b/src/widget/wspinnyglsl.cpp
@@ -66,6 +66,7 @@ void WSpinnyGLSL::setupVinylSignalQuality() {
 void WSpinnyGLSL::updateVinylSignalQualityImage(
         const QColor& qual_color, const unsigned char* data) {
     m_vinylQualityColor = qual_color;
+    m_vinylQualityColor.setAlphaF(0.75f);
     if (m_pQTexture) {
         makeCurrentIfNeeded();
         m_pQTexture->bind();