From e84acbca927ea066e4105df9130e7c9513ab9b5e Mon Sep 17 00:00:00 2001
From: Kai Blaschke <kai.blaschke@kb-dev.net>
Date: Sat, 29 Apr 2023 14:52:50 +0200
Subject: [PATCH] Renamed simple textured/untextured shaders to be more
 readable.

---
 src/libprojectM/MilkdropPreset/CMakeLists.txt             | 8 ++++----
 src/libprojectM/MilkdropPreset/MotionVectors.cpp          | 2 +-
 src/libprojectM/MilkdropPreset/PresetState.cpp            | 8 ++++----
 ...lsl330.frag => TexturedDrawFragmentShaderGlsl330.frag} | 0
 ...rGlsl330.vert => TexturedDrawVertexShaderGlsl330.vert} | 0
 ...l330.frag => UntexturedDrawFragmentShaderGlsl330.frag} | 0
 ...lsl330.vert => UntexturedDrawVertexShaderGlsl330.vert} | 0
 7 files changed, 9 insertions(+), 9 deletions(-)
 rename src/libprojectM/MilkdropPreset/Shaders/{V2fC4fT2fFragmentShaderGlsl330.frag => TexturedDrawFragmentShaderGlsl330.frag} (100%)
 rename src/libprojectM/MilkdropPreset/Shaders/{V2fC4fT2fVertexShaderGlsl330.vert => TexturedDrawVertexShaderGlsl330.vert} (100%)
 rename src/libprojectM/MilkdropPreset/Shaders/{V2fC4fFragmentShaderGlsl330.frag => UntexturedDrawFragmentShaderGlsl330.frag} (100%)
 rename src/libprojectM/MilkdropPreset/Shaders/{V2fC4fVertexShaderGlsl330.vert => UntexturedDrawVertexShaderGlsl330.vert} (100%)

diff --git a/src/libprojectM/MilkdropPreset/CMakeLists.txt b/src/libprojectM/MilkdropPreset/CMakeLists.txt
index 07ed87155..2d7d15ea4 100644
--- a/src/libprojectM/MilkdropPreset/CMakeLists.txt
+++ b/src/libprojectM/MilkdropPreset/CMakeLists.txt
@@ -10,10 +10,10 @@ set(SHADER_FILES
         Shaders/PresetShaderHeaderGlsl330.inc
         Shaders/PresetWarpFragmentShaderGlsl330.frag
         Shaders/PresetWarpVertexShaderGlsl330.vert
-        Shaders/V2fC4fFragmentShaderGlsl330.frag
-        Shaders/V2fC4fT2fFragmentShaderGlsl330.frag
-        Shaders/V2fC4fT2fVertexShaderGlsl330.vert
-        Shaders/V2fC4fVertexShaderGlsl330.vert
+        Shaders/TexturedDrawFragmentShaderGlsl330.frag
+        Shaders/TexturedDrawVertexShaderGlsl330.vert
+        Shaders/UntexturedDrawFragmentShaderGlsl330.frag
+        Shaders/UntexturedDrawVertexShaderGlsl330.vert
         )
 
 string(REPLACE ";" "\\;" SHADER_FILES_ARG "${SHADER_FILES}")
diff --git a/src/libprojectM/MilkdropPreset/MotionVectors.cpp b/src/libprojectM/MilkdropPreset/MotionVectors.cpp
index d46fb74bd..36fcd4554 100644
--- a/src/libprojectM/MilkdropPreset/MotionVectors.cpp
+++ b/src/libprojectM/MilkdropPreset/MotionVectors.cpp
@@ -10,7 +10,7 @@ MotionVectors::MotionVectors(PresetState& presetState)
 {
     auto staticShaders = libprojectM::MilkdropPreset::MilkdropStaticShaders::Get();
     m_motionVectorShader.CompileProgram(staticShaders->GetPresetMotionVectorsVertexShader(),
-                                        staticShaders->GetV2fC4fFragmentShader());
+                                        staticShaders->GetUntexturedDrawFragmentShader());
     RenderItem::Init();
 }
 
diff --git a/src/libprojectM/MilkdropPreset/PresetState.cpp b/src/libprojectM/MilkdropPreset/PresetState.cpp
index 49fa752e1..74266a88f 100644
--- a/src/libprojectM/MilkdropPreset/PresetState.cpp
+++ b/src/libprojectM/MilkdropPreset/PresetState.cpp
@@ -13,10 +13,10 @@ PresetState::PresetState()
     : globalMemory(projectm_eval_memory_buffer_create())
 {
     auto staticShaders = libprojectM::MilkdropPreset::MilkdropStaticShaders::Get();
-    untexturedShader.CompileProgram(staticShaders->GetV2fC4fVertexShader(),
-                                      staticShaders->GetV2fC4fFragmentShader());
-    texturedShader.CompileProgram(staticShaders->GetV2fC4fT2fVertexShader(),
-                                    staticShaders->GetV2fC4fT2fFragmentShader());
+    untexturedShader.CompileProgram(staticShaders->GetUntexturedDrawVertexShader(),
+                                      staticShaders->GetUntexturedDrawFragmentShader());
+    texturedShader.CompileProgram(staticShaders->GetTexturedDrawVertexShader(),
+                                    staticShaders->GetTexturedDrawFragmentShader());
 
     std::random_device randomDevice;
     std::mt19937 randomGenerator(randomDevice());
diff --git a/src/libprojectM/MilkdropPreset/Shaders/V2fC4fT2fFragmentShaderGlsl330.frag b/src/libprojectM/MilkdropPreset/Shaders/TexturedDrawFragmentShaderGlsl330.frag
similarity index 100%
rename from src/libprojectM/MilkdropPreset/Shaders/V2fC4fT2fFragmentShaderGlsl330.frag
rename to src/libprojectM/MilkdropPreset/Shaders/TexturedDrawFragmentShaderGlsl330.frag
diff --git a/src/libprojectM/MilkdropPreset/Shaders/V2fC4fT2fVertexShaderGlsl330.vert b/src/libprojectM/MilkdropPreset/Shaders/TexturedDrawVertexShaderGlsl330.vert
similarity index 100%
rename from src/libprojectM/MilkdropPreset/Shaders/V2fC4fT2fVertexShaderGlsl330.vert
rename to src/libprojectM/MilkdropPreset/Shaders/TexturedDrawVertexShaderGlsl330.vert
diff --git a/src/libprojectM/MilkdropPreset/Shaders/V2fC4fFragmentShaderGlsl330.frag b/src/libprojectM/MilkdropPreset/Shaders/UntexturedDrawFragmentShaderGlsl330.frag
similarity index 100%
rename from src/libprojectM/MilkdropPreset/Shaders/V2fC4fFragmentShaderGlsl330.frag
rename to src/libprojectM/MilkdropPreset/Shaders/UntexturedDrawFragmentShaderGlsl330.frag
diff --git a/src/libprojectM/MilkdropPreset/Shaders/V2fC4fVertexShaderGlsl330.vert b/src/libprojectM/MilkdropPreset/Shaders/UntexturedDrawVertexShaderGlsl330.vert
similarity index 100%
rename from src/libprojectM/MilkdropPreset/Shaders/V2fC4fVertexShaderGlsl330.vert
rename to src/libprojectM/MilkdropPreset/Shaders/UntexturedDrawVertexShaderGlsl330.vert