more v33 renaming and removal of dead code

luzpaz · Apr 8, 2022 · 448712b · 448712b
1 parent c5a22d3
commit 448712b
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 615 deletions.
diff --git a/renderlib/RenderGLPT.cpp b/renderlib/RenderGLPT.cpp
@@ -10,10 +10,9 @@
 #include "gl/V33FSQ.h"
 #include "gl/V33Image3D.h"
 #include "glsl/GLCopyShader.h"
+#include "glsl/GLImageShader2DnoLut.h"
 #include "glsl/GLPTVolumeShader.h"
 #include "glsl/GLToneMapShader.h"
-#include "glsl/V330GLFlatShader2D.h"
-#include "glsl/V330GLImageShader2DnoLut.h"
 
 #include <array>
 

diff --git a/renderlib/gl/Util.cpp b/renderlib/gl/Util.cpp
@@ -1,8 +1,8 @@
 #include "Util.h"
 
 #include "Logging.h"
-#include "glsl/V330GLFlatShader2D.h"
-#include "glsl/V330GLImageShader2DnoLut.h"
+#include "glsl/GLFlatShader2D.h"
+#include "glsl/GLImageShader2DnoLut.h"
 
 #include "glm.h"
 

diff --git a/renderlib/glsl/CMakeLists.txt b/renderlib/glsl/CMakeLists.txt
@@ -10,12 +10,8 @@ target_sources(renderlib PRIVATE
 	"${CMAKE_CURRENT_SOURCE_DIR}/GLPTVolumeShader.h"	
 	"${CMAKE_CURRENT_SOURCE_DIR}/GLToneMapShader.cpp"
 	"${CMAKE_CURRENT_SOURCE_DIR}/GLToneMapShader.h"	
-	"${CMAKE_CURRENT_SOURCE_DIR}/V330GLFlatShader2D.cpp"
-	"${CMAKE_CURRENT_SOURCE_DIR}/V330GLFlatShader2D.h"	
-	"${CMAKE_CURRENT_SOURCE_DIR}/V330GLImageShader2D.cpp"
-	"${CMAKE_CURRENT_SOURCE_DIR}/V330GLImageShader2D.h"	
-	"${CMAKE_CURRENT_SOURCE_DIR}/V330GLImageShader2DnoLut.cpp"
-	"${CMAKE_CURRENT_SOURCE_DIR}/V330GLImageShader2DnoLut.h"	
-	"${CMAKE_CURRENT_SOURCE_DIR}/V330GLLineShader2D.cpp"
-	"${CMAKE_CURRENT_SOURCE_DIR}/V330GLLineShader2D.h"	
+	"${CMAKE_CURRENT_SOURCE_DIR}/GLFlatShader2D.cpp"
+	"${CMAKE_CURRENT_SOURCE_DIR}/GLFlatShader2D.h"	
+	"${CMAKE_CURRENT_SOURCE_DIR}/GLImageShader2DnoLut.cpp"
+	"${CMAKE_CURRENT_SOURCE_DIR}/GLImageShader2DnoLut.h"	
 )
diff --git a/renderlib/glsl/V330GLFlatShader2D.cpp → renderlib/glsl/GLFlatShader2D.cpp b/renderlib/glsl/V330GLFlatShader2D.cpp → renderlib/glsl/GLFlatShader2D.cpp
@@ -1,4 +1,4 @@
-#include "V330GLFlatShader2D.h"
+#include "GLFlatShader2D.h"
 #include <gl/Util.h>
 #include <glm.h>
 

diff --git a/renderlib/glsl/V330GLFlatShader2D.h → renderlib/glsl/GLFlatShader2D.h b/renderlib/glsl/V330GLFlatShader2D.h → renderlib/glsl/GLFlatShader2D.h
diff --git a/renderlib/glsl/V330GLImageShader2DnoLut.cpp → renderlib/glsl/GLImageShader2DnoLut.cpp b/renderlib/glsl/V330GLImageShader2DnoLut.cpp → renderlib/glsl/GLImageShader2DnoLut.cpp
@@ -1,4 +1,4 @@
-#include "V330GLImageShader2DnoLut.h"
+#include "GLImageShader2DnoLut.h"
 
 #include "Logging.h"
 

diff --git a/renderlib/glsl/V330GLImageShader2DnoLut.h → renderlib/glsl/GLImageShader2DnoLut.h b/renderlib/glsl/V330GLImageShader2DnoLut.h → renderlib/glsl/GLImageShader2DnoLut.h
diff --git a/renderlib/glsl/V330GLImageShader2D.cpp b/renderlib/glsl/V330GLImageShader2D.cpp