- moved postprocessing shader classes to hwrenderer after removing all dependencies on OpenGL.

src/CMakeLists.txt

@@ -1027,16 +1027,6 @@ set (PCH_SOURCES
 	gl/shaders/gl_shader.cpp
 	gl/shaders/gl_shaderprogram.cpp
 	gl/shaders/gl_postprocessshader.cpp
-	gl/shaders/gl_shadowmapshader.cpp
-	gl/shaders/gl_presentshader.cpp
-	gl/shaders/gl_present3dRowshader.cpp
-	gl/shaders/gl_bloomshader.cpp
-	gl/shaders/gl_ambientshader.cpp
-	gl/shaders/gl_blurshader.cpp
-	gl/shaders/gl_colormapshader.cpp
-	gl/shaders/gl_tonemapshader.cpp
-	gl/shaders/gl_lensshader.cpp
-	gl/shaders/gl_fxaashader.cpp
 	gl/stereo3d/gl_stereo3d.cpp
 	gl/stereo3d/gl_stereo_cvars.cpp
 	gl/stereo3d/gl_stereo_leftright.cpp
@@ -1056,6 +1046,16 @@ set (PCH_SOURCES
 	hwrenderer/scene/hw_skydome.cpp
 	hwrenderer/postprocessing/hw_postprocess_cvars.cpp
 	hwrenderer/postprocessing/hw_postprocessshader.cpp
+	hwrenderer/postprocessing/hw_shadowmapshader.cpp
+	hwrenderer/postprocessing/hw_presentshader.cpp
+	hwrenderer/postprocessing/hw_present3dRowshader.cpp
+	hwrenderer/postprocessing/hw_bloomshader.cpp
+	hwrenderer/postprocessing/hw_ambientshader.cpp
+	hwrenderer/postprocessing/hw_blurshader.cpp
+	hwrenderer/postprocessing/hw_colormapshader.cpp
+	hwrenderer/postprocessing/hw_tonemapshader.cpp
+	hwrenderer/postprocessing/hw_lensshader.cpp
+	hwrenderer/postprocessing/hw_fxaashader.cpp
 	hwrenderer/textures/hw_material.cpp
 	hwrenderer/textures/hw_precache.cpp
 	hwrenderer/utility/hw_clock.cpp

src/gl/renderer/gl_postprocess.cpp

@@ -39,14 +39,14 @@
 #include "gl/renderer/gl_renderer.h"
 #include "gl/renderer/gl_postprocessstate.h"
 #include "gl/data/gl_vertexbuffer.h"
-#include "gl/shaders/gl_ambientshader.h"
+#include "hwrenderer/postprocessing/hw_ambientshader.h"
-#include "gl/shaders/gl_bloomshader.h"
+#include "hwrenderer/postprocessing/hw_bloomshader.h"
-#include "gl/shaders/gl_blurshader.h"
+#include "hwrenderer/postprocessing/hw_blurshader.h"
-#include "gl/shaders/gl_tonemapshader.h"
+#include "hwrenderer/postprocessing/hw_tonemapshader.h"
-#include "gl/shaders/gl_colormapshader.h"
+#include "hwrenderer/postprocessing/hw_colormapshader.h"
-#include "gl/shaders/gl_lensshader.h"
+#include "hwrenderer/postprocessing/hw_lensshader.h"
-#include "gl/shaders/gl_fxaashader.h"
+#include "hwrenderer/postprocessing/hw_fxaashader.h"
-#include "gl/shaders/gl_presentshader.h"
+#include "hwrenderer/postprocessing/hw_presentshader.h"
 #include "gl/shaders/gl_postprocessshaderinstance.h"
 #include "gl/stereo3d/gl_stereo3d.h"
 #include "gl/textures/gl_hwtexture.h"

src/gl/renderer/gl_renderer.cpp

@@ -50,16 +50,16 @@
 #include "gl/data/gl_vertexbuffer.h"
 #include "gl/scene/gl_drawinfo.h"
 #include "gl/scene/gl_scenedrawer.h"
-#include "gl/shaders/gl_ambientshader.h"
+#include "hwrenderer/postprocessing/hw_ambientshader.h"
-#include "gl/shaders/gl_bloomshader.h"
+#include "hwrenderer/postprocessing/hw_bloomshader.h"
-#include "gl/shaders/gl_blurshader.h"
+#include "hwrenderer/postprocessing/hw_blurshader.h"
-#include "gl/shaders/gl_tonemapshader.h"
+#include "hwrenderer/postprocessing/hw_tonemapshader.h"
-#include "gl/shaders/gl_colormapshader.h"
+#include "hwrenderer/postprocessing/hw_colormapshader.h"
-#include "gl/shaders/gl_lensshader.h"
+#include "hwrenderer/postprocessing/hw_lensshader.h"
-#include "gl/shaders/gl_fxaashader.h"
+#include "hwrenderer/postprocessing/hw_fxaashader.h"
-#include "gl/shaders/gl_presentshader.h"
+#include "hwrenderer/postprocessing/hw_presentshader.h"
-#include "gl/shaders/gl_present3dRowshader.h"
+#include "hwrenderer/postprocessing/hw_present3dRowshader.h"
-#include "gl/shaders/gl_shadowmapshader.h"
+#include "hwrenderer/postprocessing/hw_shadowmapshader.h"
 #include "gl/shaders/gl_postprocessshaderinstance.h"
 #include "gl/stereo3d/gl_stereo3d.h"
 #include "gl/textures/gl_samplers.h"

src/hwrenderer/postprocessing/hw_ambientshader.cpp

@@ -22,7 +22,7 @@
 
 #include "v_video.h"
 #include "hwrenderer/utility/hw_cvars.h"
-#include "gl_ambientshader.h"
+#include "hw_ambientshader.h"
 
 void FLinearDepthShader::Bind(IRenderQueue *q)
 {

src/hwrenderer/postprocessing/hw_bloomshader.cpp

@@ -26,7 +26,7 @@
 */
 
 #include "v_video.h"
-#include "gl/shaders/gl_bloomshader.h"
+#include "hw_bloomshader.h"
 
 void FBloomExtractShader::Bind(IRenderQueue *q)
 {

src/hwrenderer/postprocessing/hw_blurshader.cpp

@@ -26,7 +26,7 @@
 */
 
 #include "v_video.h"
-#include "gl/shaders/gl_blurshader.h"
+#include "hw_blurshader.h"
 
 void FBlurShader::Bind(IRenderQueue *q, bool vertical)
 {

src/hwrenderer/postprocessing/hw_colormapshader.cpp

@@ -26,7 +26,7 @@
 */
 
 #include "v_video.h"
-#include "gl/shaders/gl_colormapshader.h"
+#include "hw_colormapshader.h"
 
 void FColormapShader::Bind(IRenderQueue *q)
 {

src/hwrenderer/postprocessing/hw_fxaashader.cpp

@@ -24,7 +24,7 @@
 // Fast approXimate Anti-Aliasing (FXAA) post-processing
 //
 
-#include "gl/shaders/gl_fxaashader.h"
+#include "hw_fxaashader.h"
 
 EXTERN_CVAR(Int, gl_fxaa)
 

src/hwrenderer/postprocessing/hw_lensshader.cpp

@@ -26,7 +26,7 @@
 */
 
 #include "v_video.h"
-#include "gl/shaders/gl_lensshader.h"
+#include "hw_lensshader.h"
 
 void FLensShader::Bind(IRenderQueue *q)
 {

src/hwrenderer/postprocessing/hw_present3dRowshader.cpp

@@ -27,8 +27,7 @@
 **
 */
 
-#include "gl_load/gl_system.h"
+#include "hw_present3dRowshader.h"
-#include "gl/shaders/gl_present3dRowshader.h"
 
 void FPresent3DCheckerShader::Bind(IRenderQueue *q)
 {

src/hwrenderer/postprocessing/hw_present3dRowshader.h

@@ -28,8 +28,8 @@
 #ifndef GL_PRESENT3DROWSHADER_H_
 #define GL_PRESENT3DROWSHADER_H_
 
-#include "gl_shaderprogram.h"
+#include "hw_shaderprogram.h"
-#include "gl_presentshader.h"
+#include "hw_presentshader.h"
 
 class FPresent3DCheckerShader : public FPresentShaderBase
 {

src/hwrenderer/postprocessing/hw_presentshader.cpp

@@ -26,7 +26,7 @@
 */
 
 #include "v_video.h"
-#include "gl/shaders/gl_presentshader.h"
+#include "hw_presentshader.h"
 
 void FPresentShaderBase::Init(const char * vtx_shader_name, const char * program_name)
 {

src/hwrenderer/postprocessing/hw_shadowmapshader.cpp

@@ -21,7 +21,7 @@
 //
 
 #include "files.h"
-#include "gl/shaders/gl_shadowmapshader.h"
+#include "hw_shadowmapshader.h"
 
 void FShadowMapShader::Bind(IRenderQueue *q)
 {

src/hwrenderer/postprocessing/hw_tonemapshader.cpp

@@ -27,7 +27,7 @@
 
 #include "v_video.h"
 #include "hwrenderer/utility/hw_cvars.h"
-#include "gl/shaders/gl_tonemapshader.h"
+#include "hw_tonemapshader.h"
 
 void FTonemapShader::Bind(IRenderQueue *q)
 {