From c0837f42bd0e86b2f64fa1072c0ff9540deebe42 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 16 May 2018 23:34:52 +0200 Subject: [PATCH] - gl_system.h as well, in particular this has no place in hw_* files. --- src/gl/compatibility/gl_20.cpp | 2 +- src/gl/compatibility/gl_swshader20.cpp | 2 +- src/gl/data/gl_vertexbuffer.cpp | 2 +- src/gl/dynlights/gl_lightbuffer.cpp | 2 +- src/gl/dynlights/gl_shadowmap.cpp | 2 +- src/gl/models/gl_models.cpp | 2 +- src/gl/renderer/gl_lightdata.cpp | 2 +- src/gl/renderer/gl_postprocess.cpp | 2 +- src/gl/renderer/gl_postprocessstate.cpp | 2 +- src/gl/renderer/gl_quaddrawer.cpp | 2 +- src/gl/renderer/gl_renderbuffers.cpp | 2 +- src/gl/renderer/gl_renderer.cpp | 2 +- src/gl/renderer/gl_renderstate.cpp | 2 +- src/gl/scene/gl_drawinfo.cpp | 2 +- src/gl/scene/gl_flats.cpp | 2 +- src/gl/scene/gl_portal.cpp | 2 +- src/gl/scene/gl_scene.cpp | 2 +- src/gl/scene/gl_skydome.cpp | 2 +- src/gl/scene/gl_sprite.cpp | 2 +- src/gl/scene/gl_walls_draw.cpp | 2 +- src/gl/scene/gl_weapon.cpp | 2 +- src/gl/shaders/gl_ambientshader.cpp | 2 +- src/gl/shaders/gl_bloomshader.cpp | 2 +- src/gl/shaders/gl_blurshader.cpp | 2 +- src/gl/shaders/gl_colormapshader.cpp | 2 +- src/gl/shaders/gl_fxaashader.cpp | 2 +- src/gl/shaders/gl_lensshader.cpp | 2 +- src/gl/shaders/gl_postprocessshader.cpp | 2 +- src/gl/shaders/gl_present3dRowshader.cpp | 2 +- src/gl/shaders/gl_presentshader.cpp | 2 +- src/gl/shaders/gl_shader.cpp | 2 +- src/gl/shaders/gl_shaderprogram.cpp | 2 +- src/gl/shaders/gl_shadowmapshader.cpp | 2 +- src/gl/shaders/gl_tonemapshader.cpp | 2 +- src/gl/stereo3d/gl_anaglyph.h | 2 +- src/gl/stereo3d/gl_interleaved3d.h | 2 +- src/gl/stereo3d/gl_quadstereo.h | 2 +- src/gl/stereo3d/gl_sidebyside3d.h | 2 +- src/gl/stereo3d/gl_stereo3d.cpp | 2 +- src/gl/stereo3d/gl_stereo_leftright.cpp | 2 +- src/gl/stereo3d/scoped_color_mask.h | 2 +- src/gl/system/gl_debug.cpp | 2 +- src/gl/system/gl_framebuffer.cpp | 2 +- src/gl/system/gl_wipe.cpp | 2 +- src/gl/textures/gl_hwtexture.cpp | 2 +- src/gl/textures/gl_samplers.cpp | 2 +- src/gl_load/gl_interface.cpp | 2 +- src/{gl/system => gl_load}/gl_system.h | 0 src/hwrenderer/dynlights/hw_dynlightdata.cpp | 21 +++++++++--------- src/hwrenderer/scene/hw_flats.cpp | 1 - src/hwrenderer/scene/hw_skydome.cpp | 1 - src/hwrenderer/scene/hw_spritelight.cpp | 23 ++++++++++---------- src/hwrenderer/scene/hw_sprites.cpp | 1 - src/posix/sdl/sdlglvideo.cpp | 2 +- src/r_data/renderinfo.cpp | 1 - 55 files changed, 69 insertions(+), 75 deletions(-) rename src/{gl/system => gl_load}/gl_system.h (100%) diff --git a/src/gl/compatibility/gl_20.cpp b/src/gl/compatibility/gl_20.cpp index d4bb5ee64..5ff6c7710 100644 --- a/src/gl/compatibility/gl_20.cpp +++ b/src/gl/compatibility/gl_20.cpp @@ -28,7 +28,7 @@ ** */ -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "menu/menu.h" #include "r_utility.h" #include "g_levellocals.h" diff --git a/src/gl/compatibility/gl_swshader20.cpp b/src/gl/compatibility/gl_swshader20.cpp index 8f55ca335..fa9caf832 100644 --- a/src/gl/compatibility/gl_swshader20.cpp +++ b/src/gl/compatibility/gl_swshader20.cpp @@ -27,7 +27,7 @@ ** */ -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "tarray.h" #include "doomtype.h" #include "r_utility.h" diff --git a/src/gl/data/gl_vertexbuffer.cpp b/src/gl/data/gl_vertexbuffer.cpp index 532c04a06..ce32b3ab4 100644 --- a/src/gl/data/gl_vertexbuffer.cpp +++ b/src/gl/data/gl_vertexbuffer.cpp @@ -25,7 +25,7 @@ ** **/ -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "doomtype.h" #include "p_local.h" #include "r_state.h" diff --git a/src/gl/dynlights/gl_lightbuffer.cpp b/src/gl/dynlights/gl_lightbuffer.cpp index bb490baec..769adb0d7 100644 --- a/src/gl/dynlights/gl_lightbuffer.cpp +++ b/src/gl/dynlights/gl_lightbuffer.cpp @@ -25,7 +25,7 @@ ** **/ -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "gl/shaders/gl_shader.h" #include "gl/dynlights/gl_lightbuffer.h" #include "hwrenderer/utility/hw_clock.h" diff --git a/src/gl/dynlights/gl_shadowmap.cpp b/src/gl/dynlights/gl_shadowmap.cpp index 87d3c5218..15a537010 100644 --- a/src/gl/dynlights/gl_shadowmap.cpp +++ b/src/gl/dynlights/gl_shadowmap.cpp @@ -20,7 +20,7 @@ //-------------------------------------------------------------------------- // -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "gl/shaders/gl_shader.h" #include "gl/dynlights/gl_shadowmap.h" #include "gl/system/gl_debug.h" diff --git a/src/gl/models/gl_models.cpp b/src/gl/models/gl_models.cpp index 74f3b4ac5..31b7208bc 100644 --- a/src/gl/models/gl_models.cpp +++ b/src/gl/models/gl_models.cpp @@ -26,7 +26,7 @@ ** **/ -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "w_wad.h" #include "g_game.h" #include "doomstat.h" diff --git a/src/gl/renderer/gl_lightdata.cpp b/src/gl/renderer/gl_lightdata.cpp index e27aa1c5e..1810f4bfc 100644 --- a/src/gl/renderer/gl_lightdata.cpp +++ b/src/gl/renderer/gl_lightdata.cpp @@ -25,7 +25,7 @@ ** **/ -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "gl_load/gl_interface.h" #include "hwrenderer/utility/hw_cvars.h" #include "gl/renderer/gl_lightdata.h" diff --git a/src/gl/renderer/gl_postprocess.cpp b/src/gl/renderer/gl_postprocess.cpp index 00658351c..3714dc283 100644 --- a/src/gl/renderer/gl_postprocess.cpp +++ b/src/gl/renderer/gl_postprocess.cpp @@ -25,7 +25,7 @@ ** */ -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "gi.h" #include "m_png.h" #include "r_utility.h" diff --git a/src/gl/renderer/gl_postprocessstate.cpp b/src/gl/renderer/gl_postprocessstate.cpp index 85a34368e..c58b13dcc 100644 --- a/src/gl/renderer/gl_postprocessstate.cpp +++ b/src/gl/renderer/gl_postprocessstate.cpp @@ -26,7 +26,7 @@ **/ #include "templates.h" -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "gl_load/gl_interface.h" #include "gl/data/gl_vertexbuffer.h" #include "gl/renderer/gl_postprocessstate.h" diff --git a/src/gl/renderer/gl_quaddrawer.cpp b/src/gl/renderer/gl_quaddrawer.cpp index a3cc38380..fe0d3813d 100644 --- a/src/gl/renderer/gl_quaddrawer.cpp +++ b/src/gl/renderer/gl_quaddrawer.cpp @@ -20,7 +20,7 @@ //-------------------------------------------------------------------------- // -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "gl/shaders/gl_shader.h" #include "gl/renderer/gl_renderer.h" #include "gl/renderer/gl_quaddrawer.h" diff --git a/src/gl/renderer/gl_renderbuffers.cpp b/src/gl/renderer/gl_renderbuffers.cpp index 7b03f1549..3da05a9c4 100644 --- a/src/gl/renderer/gl_renderbuffers.cpp +++ b/src/gl/renderer/gl_renderbuffers.cpp @@ -25,7 +25,7 @@ ** */ -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "v_video.h" #include "gl_load/gl_interface.h" #include "hwrenderer/utility/hw_cvars.h" diff --git a/src/gl/renderer/gl_renderer.cpp b/src/gl/renderer/gl_renderer.cpp index 76ef8f78e..f8d2ead8f 100644 --- a/src/gl/renderer/gl_renderer.cpp +++ b/src/gl/renderer/gl_renderer.cpp @@ -25,7 +25,7 @@ ** */ -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "files.h" #include "v_video.h" #include "m_png.h" diff --git a/src/gl/renderer/gl_renderstate.cpp b/src/gl/renderer/gl_renderstate.cpp index 4035f6ddb..305a5177c 100644 --- a/src/gl/renderer/gl_renderstate.cpp +++ b/src/gl/renderer/gl_renderstate.cpp @@ -28,7 +28,7 @@ #include "templates.h" #include "doomstat.h" #include "r_data/colormaps.h" -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "gl_load/gl_interface.h" #include "gl/data/gl_vertexbuffer.h" #include "hwrenderer/utility/hw_cvars.h" diff --git a/src/gl/scene/gl_drawinfo.cpp b/src/gl/scene/gl_drawinfo.cpp index 533cb6440..b9ee2067d 100644 --- a/src/gl/scene/gl_drawinfo.cpp +++ b/src/gl/scene/gl_drawinfo.cpp @@ -27,7 +27,7 @@ ** */ -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "r_sky.h" #include "r_utility.h" #include "doomstat.h" diff --git a/src/gl/scene/gl_flats.cpp b/src/gl/scene/gl_flats.cpp index c1638262e..ff55d1161 100644 --- a/src/gl/scene/gl_flats.cpp +++ b/src/gl/scene/gl_flats.cpp @@ -25,7 +25,7 @@ ** */ -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "a_sharedglobal.h" #include "r_defs.h" #include "r_sky.h" diff --git a/src/gl/scene/gl_portal.cpp b/src/gl/scene/gl_portal.cpp index 2dbca45ef..e5c1064af 100644 --- a/src/gl/scene/gl_portal.cpp +++ b/src/gl/scene/gl_portal.cpp @@ -25,7 +25,7 @@ ** */ -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "p_local.h" #include "c_dispatch.h" #include "doomstat.h" diff --git a/src/gl/scene/gl_scene.cpp b/src/gl/scene/gl_scene.cpp index 20de39f77..70350b018 100644 --- a/src/gl/scene/gl_scene.cpp +++ b/src/gl/scene/gl_scene.cpp @@ -25,7 +25,7 @@ ** */ -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "gi.h" #include "m_png.h" #include "doomstat.h" diff --git a/src/gl/scene/gl_skydome.cpp b/src/gl/scene/gl_skydome.cpp index c88e1e2f2..a476d2ab3 100644 --- a/src/gl/scene/gl_skydome.cpp +++ b/src/gl/scene/gl_skydome.cpp @@ -20,7 +20,7 @@ //-------------------------------------------------------------------------- // -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "doomtype.h" #include "g_level.h" #include "w_wad.h" diff --git a/src/gl/scene/gl_sprite.cpp b/src/gl/scene/gl_sprite.cpp index 4bcad49fc..2713cf759 100644 --- a/src/gl/scene/gl_sprite.cpp +++ b/src/gl/scene/gl_sprite.cpp @@ -25,7 +25,7 @@ ** */ -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "p_local.h" #include "p_effect.h" #include "g_level.h" diff --git a/src/gl/scene/gl_walls_draw.cpp b/src/gl/scene/gl_walls_draw.cpp index 20a7542e2..a49593550 100644 --- a/src/gl/scene/gl_walls_draw.cpp +++ b/src/gl/scene/gl_walls_draw.cpp @@ -20,7 +20,7 @@ //-------------------------------------------------------------------------- // -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "p_local.h" #include "p_lnspec.h" #include "a_sharedglobal.h" diff --git a/src/gl/scene/gl_weapon.cpp b/src/gl/scene/gl_weapon.cpp index 60f6fda59..6ab0d5222 100644 --- a/src/gl/scene/gl_weapon.cpp +++ b/src/gl/scene/gl_weapon.cpp @@ -25,7 +25,7 @@ ** */ -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "r_utility.h" #include "v_video.h" diff --git a/src/gl/shaders/gl_ambientshader.cpp b/src/gl/shaders/gl_ambientshader.cpp index a314d9812..aafb51204 100644 --- a/src/gl/shaders/gl_ambientshader.cpp +++ b/src/gl/shaders/gl_ambientshader.cpp @@ -20,7 +20,7 @@ //-------------------------------------------------------------------------- // -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "v_video.h" #include "hwrenderer/utility/hw_cvars.h" #include "gl/shaders/gl_ambientshader.h" diff --git a/src/gl/shaders/gl_bloomshader.cpp b/src/gl/shaders/gl_bloomshader.cpp index 2623723df..94a84b8c1 100644 --- a/src/gl/shaders/gl_bloomshader.cpp +++ b/src/gl/shaders/gl_bloomshader.cpp @@ -25,7 +25,7 @@ ** */ -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "v_video.h" #include "gl/shaders/gl_bloomshader.h" diff --git a/src/gl/shaders/gl_blurshader.cpp b/src/gl/shaders/gl_blurshader.cpp index 623912087..a581d531e 100644 --- a/src/gl/shaders/gl_blurshader.cpp +++ b/src/gl/shaders/gl_blurshader.cpp @@ -25,7 +25,7 @@ ** */ -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "v_video.h" #include "gl/shaders/gl_blurshader.h" #include "gl/data/gl_vertexbuffer.h" diff --git a/src/gl/shaders/gl_colormapshader.cpp b/src/gl/shaders/gl_colormapshader.cpp index f02150c0a..5f9680c41 100644 --- a/src/gl/shaders/gl_colormapshader.cpp +++ b/src/gl/shaders/gl_colormapshader.cpp @@ -25,7 +25,7 @@ ** */ -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "v_video.h" #include "gl/shaders/gl_colormapshader.h" diff --git a/src/gl/shaders/gl_fxaashader.cpp b/src/gl/shaders/gl_fxaashader.cpp index 277c7fbb3..b5550bcf3 100644 --- a/src/gl/shaders/gl_fxaashader.cpp +++ b/src/gl/shaders/gl_fxaashader.cpp @@ -24,7 +24,7 @@ // Fast approXimate Anti-Aliasing (FXAA) post-processing // -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "gl/shaders/gl_fxaashader.h" EXTERN_CVAR(Int, gl_fxaa) diff --git a/src/gl/shaders/gl_lensshader.cpp b/src/gl/shaders/gl_lensshader.cpp index 611d31a28..96ec217a3 100644 --- a/src/gl/shaders/gl_lensshader.cpp +++ b/src/gl/shaders/gl_lensshader.cpp @@ -25,7 +25,7 @@ ** */ -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "v_video.h" #include "gl/shaders/gl_lensshader.h" diff --git a/src/gl/shaders/gl_postprocessshader.cpp b/src/gl/shaders/gl_postprocessshader.cpp index 12fa71146..5d8e35b8d 100644 --- a/src/gl/shaders/gl_postprocessshader.cpp +++ b/src/gl/shaders/gl_postprocessshader.cpp @@ -20,7 +20,7 @@ //-------------------------------------------------------------------------- // -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "v_video.h" #include "w_wad.h" #include "gl_load/gl_interface.h" diff --git a/src/gl/shaders/gl_present3dRowshader.cpp b/src/gl/shaders/gl_present3dRowshader.cpp index 9162d95af..12b7b2843 100644 --- a/src/gl/shaders/gl_present3dRowshader.cpp +++ b/src/gl/shaders/gl_present3dRowshader.cpp @@ -27,7 +27,7 @@ ** */ -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "gl/shaders/gl_present3dRowshader.h" void FPresentStereoShaderBase::Init(const char * vtx_shader_name, const char * program_name) diff --git a/src/gl/shaders/gl_presentshader.cpp b/src/gl/shaders/gl_presentshader.cpp index 503d75803..119a24d08 100644 --- a/src/gl/shaders/gl_presentshader.cpp +++ b/src/gl/shaders/gl_presentshader.cpp @@ -25,7 +25,7 @@ ** */ -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "v_video.h" #include "gl/shaders/gl_presentshader.h" diff --git a/src/gl/shaders/gl_shader.cpp b/src/gl/shaders/gl_shader.cpp index 49803da00..92293760a 100644 --- a/src/gl/shaders/gl_shader.cpp +++ b/src/gl/shaders/gl_shader.cpp @@ -26,7 +26,7 @@ ** */ -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "c_cvars.h" #include "v_video.h" #include "w_wad.h" diff --git a/src/gl/shaders/gl_shaderprogram.cpp b/src/gl/shaders/gl_shaderprogram.cpp index 3014515f3..ae973cb3e 100644 --- a/src/gl/shaders/gl_shaderprogram.cpp +++ b/src/gl/shaders/gl_shaderprogram.cpp @@ -25,7 +25,7 @@ ** */ -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "v_video.h" #include "gl_load/gl_interface.h" #include "hwrenderer/utility/hw_cvars.h" diff --git a/src/gl/shaders/gl_shadowmapshader.cpp b/src/gl/shaders/gl_shadowmapshader.cpp index 684d44339..bed204d92 100644 --- a/src/gl/shaders/gl_shadowmapshader.cpp +++ b/src/gl/shaders/gl_shadowmapshader.cpp @@ -20,7 +20,7 @@ //-------------------------------------------------------------------------- // -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "files.h" #include "gl/shaders/gl_shadowmapshader.h" diff --git a/src/gl/shaders/gl_tonemapshader.cpp b/src/gl/shaders/gl_tonemapshader.cpp index ef0c8a104..a5012833a 100644 --- a/src/gl/shaders/gl_tonemapshader.cpp +++ b/src/gl/shaders/gl_tonemapshader.cpp @@ -25,7 +25,7 @@ ** */ -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "v_video.h" #include "hwrenderer/utility/hw_cvars.h" #include "gl/shaders/gl_tonemapshader.h" diff --git a/src/gl/stereo3d/gl_anaglyph.h b/src/gl/stereo3d/gl_anaglyph.h index c05174e35..110493de9 100644 --- a/src/gl/stereo3d/gl_anaglyph.h +++ b/src/gl/stereo3d/gl_anaglyph.h @@ -30,7 +30,7 @@ #include "gl_stereo3d.h" #include "gl_stereo_leftright.h" -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "gl/renderer/gl_renderstate.h" diff --git a/src/gl/stereo3d/gl_interleaved3d.h b/src/gl/stereo3d/gl_interleaved3d.h index 78bd19483..68125cccd 100644 --- a/src/gl/stereo3d/gl_interleaved3d.h +++ b/src/gl/stereo3d/gl_interleaved3d.h @@ -39,7 +39,7 @@ #include "gl_stereo3d.h" #include "gl_stereo_leftright.h" #include "gl_sidebyside3d.h" -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "gl/renderer/gl_renderstate.h" namespace s3d { diff --git a/src/gl/stereo3d/gl_quadstereo.h b/src/gl/stereo3d/gl_quadstereo.h index 377d846b3..014a91991 100644 --- a/src/gl/stereo3d/gl_quadstereo.h +++ b/src/gl/stereo3d/gl_quadstereo.h @@ -30,7 +30,7 @@ #include "gl_stereo3d.h" #include "gl_stereo_leftright.h" -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" namespace s3d { diff --git a/src/gl/stereo3d/gl_sidebyside3d.h b/src/gl/stereo3d/gl_sidebyside3d.h index c98f748a0..78c07d0ad 100644 --- a/src/gl/stereo3d/gl_sidebyside3d.h +++ b/src/gl/stereo3d/gl_sidebyside3d.h @@ -38,7 +38,7 @@ #include "gl_stereo3d.h" #include "gl_stereo_leftright.h" -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "gl/renderer/gl_renderstate.h" diff --git a/src/gl/stereo3d/gl_stereo3d.cpp b/src/gl/stereo3d/gl_stereo3d.cpp index 1453394c3..6fbc5e764 100644 --- a/src/gl/stereo3d/gl_stereo3d.cpp +++ b/src/gl/stereo3d/gl_stereo3d.cpp @@ -25,7 +25,7 @@ ** */ -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "gl/stereo3d/gl_stereo3d.h" namespace s3d { diff --git a/src/gl/stereo3d/gl_stereo_leftright.cpp b/src/gl/stereo3d/gl_stereo_leftright.cpp index 94633bbc0..f6eebc509 100644 --- a/src/gl/stereo3d/gl_stereo_leftright.cpp +++ b/src/gl/stereo3d/gl_stereo_leftright.cpp @@ -29,7 +29,7 @@ #include "vectors.h" // RAD2DEG #include "doomtype.h" // M_PI #include "hwrenderer/utility/hw_cvars.h" -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "gl/renderer/gl_renderstate.h" #include "gl/renderer/gl_renderer.h" #include "gl/renderer/gl_renderbuffers.h" diff --git a/src/gl/stereo3d/scoped_color_mask.h b/src/gl/stereo3d/scoped_color_mask.h index e55772092..4e2103a28 100644 --- a/src/gl/stereo3d/scoped_color_mask.h +++ b/src/gl/stereo3d/scoped_color_mask.h @@ -28,7 +28,7 @@ #ifndef GL_STEREO3D_SCOPED_COLOR_MASK_H_ #define GL_STEREO3D_SCOPED_COLOR_MASK_H_ -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" /** * Temporarily change color mask diff --git a/src/gl/system/gl_debug.cpp b/src/gl/system/gl_debug.cpp index deb4cb633..920550c9b 100644 --- a/src/gl/system/gl_debug.cpp +++ b/src/gl/system/gl_debug.cpp @@ -26,7 +26,7 @@ */ #include "templates.h" -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "gl/system/gl_debug.h" #include "stats.h" #include diff --git a/src/gl/system/gl_framebuffer.cpp b/src/gl/system/gl_framebuffer.cpp index 0d0bbf58c..7bb47f8c8 100644 --- a/src/gl/system/gl_framebuffer.cpp +++ b/src/gl/system/gl_framebuffer.cpp @@ -26,7 +26,7 @@ ** */ -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "v_video.h" #include "m_png.h" #include "templates.h" diff --git a/src/gl/system/gl_wipe.cpp b/src/gl/system/gl_wipe.cpp index ea67b9b85..84d72bd98 100644 --- a/src/gl/system/gl_wipe.cpp +++ b/src/gl/system/gl_wipe.cpp @@ -24,7 +24,7 @@ ** */ -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "f_wipe.h" #include "m_random.h" #include "w_wad.h" diff --git a/src/gl/textures/gl_hwtexture.cpp b/src/gl/textures/gl_hwtexture.cpp index bad5ef69c..36feab0b7 100644 --- a/src/gl/textures/gl_hwtexture.cpp +++ b/src/gl/textures/gl_hwtexture.cpp @@ -26,7 +26,7 @@ ** */ -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "templates.h" #include "c_cvars.h" #include "r_data/colormaps.h" diff --git a/src/gl/textures/gl_samplers.cpp b/src/gl/textures/gl_samplers.cpp index ab29e7adf..3f4bca1e8 100644 --- a/src/gl/textures/gl_samplers.cpp +++ b/src/gl/textures/gl_samplers.cpp @@ -20,7 +20,7 @@ //-------------------------------------------------------------------------- // -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "c_cvars.h" #include "gl_load/gl_interface.h" diff --git a/src/gl_load/gl_interface.cpp b/src/gl_load/gl_interface.cpp index 3bc752c6b..ee47ce5a0 100644 --- a/src/gl_load/gl_interface.cpp +++ b/src/gl_load/gl_interface.cpp @@ -26,7 +26,7 @@ ** */ -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "tarray.h" #include "doomtype.h" #include "m_argv.h" diff --git a/src/gl/system/gl_system.h b/src/gl_load/gl_system.h similarity index 100% rename from src/gl/system/gl_system.h rename to src/gl_load/gl_system.h diff --git a/src/hwrenderer/dynlights/hw_dynlightdata.cpp b/src/hwrenderer/dynlights/hw_dynlightdata.cpp index 327ab5700..dce24d689 100644 --- a/src/hwrenderer/dynlights/hw_dynlightdata.cpp +++ b/src/hwrenderer/dynlights/hw_dynlightdata.cpp @@ -25,7 +25,6 @@ ** **/ -#include "gl/system/gl_system.h" #include "actorinlines.h" #include "hw_dynlightdata.h" @@ -55,11 +54,11 @@ bool FDynLightData::GetLight(int group, Plane & p, ADynamicLight * light, bool c DVector3 pos = light->PosRelative(group); float radius = (light->GetRadius()); - float dist = fabsf(p.DistToPoint(pos.X, pos.Z, pos.Y)); + auto dist = fabs(p.DistToPoint((float)pos.X, (float)pos.Z, (float)pos.Y)); if (radius <= 0.f) return false; if (dist > radius) return false; - if (checkside && p.PointOnSide(pos.X, pos.Z, pos.Y)) + if (checkside && p.PointOnSide((float)pos.X, (float)pos.Z, (float)pos.Y)) { return false; } @@ -124,20 +123,20 @@ void FDynLightData::AddLightToList(int group, ADynamicLight * light) if (light->IsSpot()) { lightType = 1.0f; - spotInnerAngle = light->SpotInnerAngle.Cos(); - spotOuterAngle = light->SpotOuterAngle.Cos(); + spotInnerAngle = (float)light->SpotInnerAngle.Cos(); + spotOuterAngle = (float)light->SpotOuterAngle.Cos(); DAngle negPitch = -light->Angles.Pitch; double xzLen = negPitch.Cos(); - spotDirX = -light->Angles.Yaw.Cos() * xzLen; - spotDirY = -negPitch.Sin(); - spotDirZ = -light->Angles.Yaw.Sin() * xzLen; + spotDirX = float(-light->Angles.Yaw.Cos() * xzLen); + spotDirY = float(-negPitch.Sin()); + spotDirZ = float(-light->Angles.Yaw.Sin() * xzLen); } float *data = &arrays[i][arrays[i].Reserve(16)]; - data[0] = pos.X; - data[1] = pos.Z; - data[2] = pos.Y; + data[0] = float(pos.X); + data[1] = float(pos.Z); + data[2] = float(pos.Y); data[3] = radius; data[4] = r; data[5] = g; diff --git a/src/hwrenderer/scene/hw_flats.cpp b/src/hwrenderer/scene/hw_flats.cpp index 050110c9f..dabee535d 100644 --- a/src/hwrenderer/scene/hw_flats.cpp +++ b/src/hwrenderer/scene/hw_flats.cpp @@ -25,7 +25,6 @@ ** */ -#include "gl/system/gl_system.h" #include "a_sharedglobal.h" #include "r_defs.h" #include "r_sky.h" diff --git a/src/hwrenderer/scene/hw_skydome.cpp b/src/hwrenderer/scene/hw_skydome.cpp index 22c0f252b..84272a7b4 100644 --- a/src/hwrenderer/scene/hw_skydome.cpp +++ b/src/hwrenderer/scene/hw_skydome.cpp @@ -53,7 +53,6 @@ **--------------------------------------------------------------------------- ** */ -#include "gl/system/gl_system.h" #include "doomtype.h" #include "g_level.h" #include "w_wad.h" diff --git a/src/hwrenderer/scene/hw_spritelight.cpp b/src/hwrenderer/scene/hw_spritelight.cpp index cd3e8a293..95219dc7b 100644 --- a/src/hwrenderer/scene/hw_spritelight.cpp +++ b/src/hwrenderer/scene/hw_spritelight.cpp @@ -25,7 +25,6 @@ ** */ -#include "gl/system/gl_system.h" #include "c_dispatch.h" #include "p_local.h" #include "p_effect.h" @@ -74,15 +73,15 @@ void HWDrawInfo::GetDynSpriteLight(AActor *self, float x, float y, float z, FLig if (fromgroup == togroup || fromgroup == 0 || togroup == 0) goto direct; DVector2 offset = level.Displacements.getOffset(fromgroup, togroup); - L = FVector3(x - light->X() - offset.X, y - light->Y() - offset.Y, z - light->Z()); + L = FVector3(x - (float)(light->X() + offset.X), y - (float)(light->Y() + offset.Y), z - (float)light->Z()); } else { direct: - L = FVector3(x - light->X(), y - light->Y(), z - light->Z()); + L = FVector3(x - (float)light->X(), y - (float)light->Y(), z - (float)light->Z()); } - dist = L.LengthSquared(); + dist = (float)L.LengthSquared(); radius = light->GetRadius(); if (dist < radius * radius) @@ -110,7 +109,7 @@ void HWDrawInfo::GetDynSpriteLight(AActor *self, float x, float y, float z, FLig lb = light->GetBlue() / 255.0f; if (light->IsSubtractive()) { - float bright = FVector3(lr, lg, lb).Length(); + float bright = (float)FVector3(lr, lg, lb).Length(); FVector3 lightColor(lr, lg, lb); lr = (bright - lr) * -1; lg = (bright - lg) * -1; @@ -131,11 +130,11 @@ void HWDrawInfo::GetDynSpriteLight(AActor *thing, particle_t *particle, float *o { if (thing != NULL) { - GetDynSpriteLight(thing, thing->X(), thing->Y(), thing->Center(), thing->subsector->lighthead, thing->Sector->PortalGroup, out); + GetDynSpriteLight(thing, (float)thing->X(), (float)thing->Y(), (float)thing->Center(), thing->subsector->lighthead, thing->Sector->PortalGroup, out); } else if (particle != NULL) { - GetDynSpriteLight(NULL, particle->Pos.X, particle->Pos.Y, particle->Pos.Z, particle->subsector->lighthead, particle->subsector->sector->PortalGroup, out); + GetDynSpriteLight(NULL, (float)particle->Pos.X, (float)particle->Pos.Y, (float)particle->Pos.Z, particle->subsector->lighthead, particle->subsector->sector->PortalGroup, out); } } @@ -196,10 +195,10 @@ void hw_GetDynModelLight(AActor *self, FDynLightData &modellightdata) addedLights.Clear(); - float x = self->X(); - float y = self->Y(); - float z = self->Center(); - float radiusSquared = self->renderradius * self->renderradius; + float x = (float)self->X(); + float y = (float)self->Y(); + float z = (float)self->Center(); + float radiusSquared = (float)(self->renderradius * self->renderradius); BSPWalkCircle(x, y, radiusSquared, [&](subsector_t *subsector) // Iterate through all subsectors potentially touched by actor { @@ -211,7 +210,7 @@ void hw_GetDynModelLight(AActor *self, FDynLightData &modellightdata) { int group = subsector->sector->PortalGroup; DVector3 pos = light->PosRelative(group); - float radius = light->GetRadius() + self->renderradius; + float radius = (float)(light->GetRadius() + self->renderradius); double dx = pos.X - x; double dy = pos.Y - y; double dz = pos.Z - z; diff --git a/src/hwrenderer/scene/hw_sprites.cpp b/src/hwrenderer/scene/hw_sprites.cpp index 4a0c82bf5..6814d1760 100644 --- a/src/hwrenderer/scene/hw_sprites.cpp +++ b/src/hwrenderer/scene/hw_sprites.cpp @@ -25,7 +25,6 @@ ** */ -#include "gl/system/gl_system.h" #include "p_local.h" #include "p_effect.h" #include "g_level.h" diff --git a/src/posix/sdl/sdlglvideo.cpp b/src/posix/sdl/sdlglvideo.cpp index 4ed9e3a9f..98c8dcab4 100644 --- a/src/posix/sdl/sdlglvideo.cpp +++ b/src/posix/sdl/sdlglvideo.cpp @@ -45,7 +45,7 @@ #include "videomodes.h" #include "hardware.h" #include "gl_sysfb.h" -#include "gl/system/gl_system.h" +#include "gl_load/gl_system.h" #include "r_defs.h" #include "gl/renderer/gl_renderer.h" diff --git a/src/r_data/renderinfo.cpp b/src/r_data/renderinfo.cpp index 2d8343e15..f0b8600fe 100644 --- a/src/r_data/renderinfo.cpp +++ b/src/r_data/renderinfo.cpp @@ -26,7 +26,6 @@ ** **/ -#include "gl/system/gl_system.h" #include "doomtype.h" #include "p_local.h" #include "p_spec.h"