allshader RGB,Filtered and Stacked using textures for waveform data

CMakeLists.txt

@@ -1206,12 +1206,12 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/util/workerthreadscheduler.cpp
   src/util/xml.cpp
   src/waveform/guitick.cpp
-  src/waveform/renderers/glslwaveformrenderersignal.cpp
-  src/waveform/renderers/glvsynctestrenderer.cpp
-  src/waveform/renderers/glwaveformrenderbackground.cpp
-  src/waveform/renderers/glwaveformrendererfilteredsignal.cpp
-  src/waveform/renderers/glwaveformrendererrgb.cpp
-  src/waveform/renderers/glwaveformrenderersimplesignal.cpp
+  src/waveform/renderers/deprecated/glslwaveformrenderersignal.cpp
+  src/waveform/renderers/deprecated/glvsynctestrenderer.cpp
+  src/waveform/renderers/deprecated/glwaveformrenderbackground.cpp
+  src/waveform/renderers/deprecated/glwaveformrendererfilteredsignal.cpp
+  src/waveform/renderers/deprecated/glwaveformrendererrgb.cpp
+  src/waveform/renderers/deprecated/glwaveformrenderersimplesignal.cpp
   src/waveform/renderers/waveformmark.cpp
   src/waveform/renderers/waveformmarkrange.cpp
   src/waveform/renderers/waveformmarkset.cpp
@@ -1238,12 +1238,12 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/waveform/waveformmarklabel.cpp
   src/waveform/waveformwidgetfactory.cpp
   src/waveform/widgets/emptywaveformwidget.cpp
-  src/waveform/widgets/glrgbwaveformwidget.cpp
-  src/waveform/widgets/glsimplewaveformwidget.cpp
-  src/waveform/widgets/glslwaveformwidget.cpp
-  src/waveform/widgets/glvsynctestwidget.cpp
-  src/waveform/widgets/glwaveformwidget.cpp
-  src/waveform/widgets/glwaveformwidgetabstract.cpp
+  src/waveform/widgets/deprecated/glrgbwaveformwidget.cpp
+  src/waveform/widgets/deprecated/glsimplewaveformwidget.cpp
+  src/waveform/widgets/deprecated/glslwaveformwidget.cpp
+  src/waveform/widgets/deprecated/glvsynctestwidget.cpp
+  src/waveform/widgets/deprecated/glwaveformwidget.cpp
+  src/waveform/widgets/deprecated/glwaveformwidgetabstract.cpp
   src/waveform/widgets/hsvwaveformwidget.cpp
   src/waveform/widgets/rgbwaveformwidget.cpp
   src/waveform/widgets/softwarewaveformwidget.cpp
@@ -1523,6 +1523,7 @@ if(QOPENGL)
     src/waveform/renderers/allshader/waveformrendererlrrgb.cpp
     src/waveform/renderers/allshader/waveformrendererpreroll.cpp
     src/waveform/renderers/allshader/waveformrendererrgb.cpp
+    src/waveform/renderers/allshader/waveformrenderertextured.cpp
     src/waveform/renderers/allshader/waveformrenderersignalbase.cpp
     src/waveform/renderers/allshader/waveformrenderersimple.cpp
     src/waveform/renderers/allshader/waveformrendermark.cpp
@@ -1531,8 +1532,12 @@ if(QOPENGL)
     src/waveform/widgets/allshader/hsvwaveformwidget.cpp
     src/waveform/widgets/allshader/lrrgbwaveformwidget.cpp
     src/waveform/widgets/allshader/rgbwaveformwidget.cpp
+    src/waveform/widgets/allshader/rgbstackedwaveformwidget.cpp
     src/waveform/widgets/allshader/simplewaveformwidget.cpp
     src/waveform/widgets/allshader/waveformwidget.cpp
+    src/waveform/widgets/allshader/waveformwidgettexturedfiltered.cpp
+    src/waveform/widgets/allshader/waveformwidgettexturedrgb.cpp
+    src/waveform/widgets/allshader/waveformwidgettexturedstacked.cpp
     src/widget/openglwindow.cpp
     src/widget/tooltipqopengl.cpp
     src/widget/wglwidgetqopengl.cpp

src/preferences/upgrade.cpp

@@ -44,23 +44,30 @@ WaveformWidgetType::Type upgradeToAllShaders(WaveformWidgetType::Type waveformTy
     case WWT::AllShaderRGBWaveform:
     case WWT::AllShaderLRRGBWaveform:
     case WWT::AllShaderFilteredWaveform:
+    case WWT::AllShaderRGBStackedWaveform:
     case WWT::AllShaderSimpleWaveform:
     case WWT::AllShaderHSVWaveform:
+    case WWT::AllShaderTexturedFiltered:
+    case WWT::AllShaderTexturedRGB:
+    case WWT::AllShaderTexturedStacked:
     case WWT::Count_WaveformwidgetType:
         return waveformType;
     case WWT::QtSimpleWaveform:
     case WWT::GLSimpleWaveform:
         return WaveformWidgetType::AllShaderSimpleWaveform;
     case WWT::GLFilteredWaveform:
-    case WWT::GLSLFilteredWaveform:
         return WaveformWidgetType::AllShaderFilteredWaveform;
+    case WWT::GLSLFilteredWaveform:
+        return WaveformWidgetType::AllShaderTexturedFiltered;
     case WWT::QtWaveform:
     case WWT::RGBWaveform:
     case WWT::GLRGBWaveform:
-    case WWT::GLSLRGBWaveform:
     case WWT::QtRGBWaveform:
-    case WWT::GLSLRGBStackedWaveform:
         return WWT::AllShaderRGBWaveform;
+    case WWT::GLSLRGBWaveform:
+        return WWT::AllShaderTexturedRGB;
+    case WWT::GLSLRGBStackedWaveform:
+        return WWT::AllShaderTexturedStacked;
     case WWT::HSVWaveform:
     case WWT::QtHSVWaveform:
         return WWT::AllShaderHSVWaveform;

src/waveform/renderers/allshader/waveformrendererfiltered.cpp

@@ -9,8 +9,9 @@
 namespace allshader {
 
 WaveformRendererFiltered::WaveformRendererFiltered(
-        WaveformWidgetRenderer* waveformWidget)
-        : WaveformRendererSignalBase(waveformWidget) {
+        WaveformWidgetRenderer* waveformWidget, bool bRgbStacked)
+        : WaveformRendererSignalBase(waveformWidget),
+          m_bRgbStacked(bRgbStacked) {
 }
 
 void WaveformRendererFiltered::onSetup(const QDomNode& node) {
@@ -147,15 +148,27 @@ void WaveformRendererFiltered::paintGL() {
     m_shader.setUniformValue(matrixLocation, matrix);
 
     QColor colors[4];
-    colors[0].setRgbF(static_cast<float>(m_rgbLowColor_r),
-            static_cast<float>(m_rgbLowColor_g),
-            static_cast<float>(m_rgbLowColor_b));
-    colors[1].setRgbF(static_cast<float>(m_rgbMidColor_r),
-            static_cast<float>(m_rgbMidColor_g),
-            static_cast<float>(m_rgbMidColor_b));
-    colors[2].setRgbF(static_cast<float>(m_rgbHighColor_r),
-            static_cast<float>(m_rgbHighColor_g),
-            static_cast<float>(m_rgbHighColor_b));
+    if (m_bRgbStacked) {
+        colors[0].setRgbF(static_cast<float>(m_rgbLowColor_r),
+                static_cast<float>(m_rgbLowColor_g),
+                static_cast<float>(m_rgbLowColor_b));
+        colors[1].setRgbF(static_cast<float>(m_rgbMidColor_r),
+                static_cast<float>(m_rgbMidColor_g),
+                static_cast<float>(m_rgbMidColor_b));
+        colors[2].setRgbF(static_cast<float>(m_rgbHighColor_r),
+                static_cast<float>(m_rgbHighColor_g),
+                static_cast<float>(m_rgbHighColor_b));
+    } else {
+        colors[0].setRgbF(static_cast<float>(m_lowColor_r),
+                static_cast<float>(m_lowColor_g),
+                static_cast<float>(m_lowColor_b));
+        colors[1].setRgbF(static_cast<float>(m_midColor_r),
+                static_cast<float>(m_midColor_g),
+                static_cast<float>(m_midColor_b));
+        colors[2].setRgbF(static_cast<float>(m_highColor_r),
+                static_cast<float>(m_highColor_g),
+                static_cast<float>(m_highColor_b));
+    }
     colors[3].setRgbF(static_cast<float>(m_axesColor_r),
             static_cast<float>(m_axesColor_g),
             static_cast<float>(m_axesColor_b),

src/waveform/renderers/allshader/waveformrendererfiltered.h

@@ -11,7 +11,7 @@ class WaveformRendererFiltered;
 
 class allshader::WaveformRendererFiltered final : public allshader::WaveformRendererSignalBase {
   public:
-    explicit WaveformRendererFiltered(WaveformWidgetRenderer* waveformWidget);
+    explicit WaveformRendererFiltered(WaveformWidgetRenderer* waveformWidget, bool rgbStacked);
 
     // override ::WaveformRendererSignalBase
     void onSetup(const QDomNode& node) override;
@@ -20,6 +20,7 @@ class allshader::WaveformRendererFiltered final : public allshader::WaveformRend
     void paintGL() override;
 
   private:
+    const bool m_bRgbStacked;
     mixxx::UnicolorShader m_shader;
     VertexData m_vertices[4];