From 68630d67823e44b0eb2236fa2d5227f4b1f77b6c Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 29 Apr 2020 18:48:15 +0200 Subject: [PATCH] - sanitized dependencies of the softpoly render backend. This included half the game state and lots of unneeded parts of the software renderer. The two modules that are shared between softpoly and the classic software renderer have been moved to a neutral place. --- src/CMakeLists.txt | 3 +- src/common/platform/posix/i_system_posix.cpp | 51 +++++++++++-------- .../drawers => common/rendering}/r_thread.h | 4 +- src/common/utility/basics.h | 3 ++ src/common/utility/m_bbox.cpp | 47 ----------------- src/common/utility/m_bbox.h | 38 +++++--------- .../utility}/r_memory.cpp | 40 ++++++++------- .../swrenderer => common/utility}/r_memory.h | 0 src/gamedata/r_defs.h | 3 -- .../polyrenderer/backend/poly_framebuffer.cpp | 3 ++ .../polyrenderer/backend/poly_framebuffer.h | 4 +- .../polyrenderer/backend/poly_renderstate.h | 1 - .../polyrenderer/drawers/poly_thread.cpp | 13 ++--- .../polyrenderer/drawers/poly_triangle.cpp | 9 ---- .../polyrenderer/drawers/poly_triangle.h | 4 +- .../polyrenderer/drawers/screen_blend.cpp | 4 ++ .../drawers/screen_scanline_setup.cpp | 5 +- .../polyrenderer/drawers/screen_shader.cpp | 1 - .../polyrenderer/drawers/screen_triangle.cpp | 9 ---- .../polyrenderer/drawers/screen_triangle.h | 2 +- src/rendering/swrenderer/drawers/r_thread.cpp | 2 +- .../swrenderer/line/r_farclip_line.cpp | 2 +- .../swrenderer/line/r_fogboundary.cpp | 2 +- src/rendering/swrenderer/line/r_line.cpp | 2 +- .../swrenderer/line/r_renderdrawsegment.cpp | 2 +- src/rendering/swrenderer/line/r_walldraw.cpp | 2 +- src/rendering/swrenderer/line/r_wallsetup.cpp | 2 +- .../swrenderer/plane/r_flatplane.cpp | 2 +- src/rendering/swrenderer/plane/r_skyplane.cpp | 2 +- .../swrenderer/plane/r_slopeplane.cpp | 2 +- .../swrenderer/plane/r_visibleplane.cpp | 2 +- .../swrenderer/plane/r_visibleplane.h | 2 +- .../swrenderer/plane/r_visibleplanelist.cpp | 2 +- src/rendering/swrenderer/r_all.cpp | 1 - src/rendering/swrenderer/r_renderthread.cpp | 2 +- src/rendering/swrenderer/scene/r_3dfloors.cpp | 2 +- src/rendering/swrenderer/scene/r_portal.cpp | 2 +- src/rendering/swrenderer/scene/r_scene.cpp | 4 +- .../swrenderer/scene/r_translucent_pass.cpp | 2 +- .../swrenderer/segments/r_drawsegment.cpp | 2 +- .../swrenderer/segments/r_portalsegment.cpp | 2 +- src/rendering/swrenderer/things/r_decal.cpp | 2 +- src/rendering/swrenderer/things/r_model.cpp | 2 +- .../swrenderer/things/r_particle.cpp | 2 +- .../swrenderer/things/r_playersprite.cpp | 2 +- src/rendering/swrenderer/things/r_sprite.cpp | 2 +- .../swrenderer/things/r_visiblesprite.cpp | 2 +- .../swrenderer/things/r_visiblespritelist.cpp | 2 +- src/rendering/swrenderer/things/r_voxel.cpp | 4 +- .../swrenderer/things/r_wallsprite.cpp | 2 +- 50 files changed, 121 insertions(+), 186 deletions(-) rename src/{rendering/swrenderer/drawers => common/rendering}/r_thread.h (98%) delete mode 100644 src/common/utility/m_bbox.cpp rename src/{rendering/swrenderer => common/utility}/r_memory.cpp (62%) rename src/{rendering/swrenderer => common/utility}/r_memory.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8eb804f788..02228a1182 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -660,7 +660,6 @@ file( GLOB HEADER_FILES set ( SWRENDER_SOURCES rendering/swrenderer/r_swcolormaps.cpp rendering/swrenderer/r_swrenderer.cpp - rendering/swrenderer/r_memory.cpp rendering/swrenderer/r_renderthread.cpp rendering/swrenderer/drawers/r_draw.cpp rendering/swrenderer/drawers/r_draw_pal.cpp @@ -1084,7 +1083,7 @@ set (PCH_SOURCES common/utility/s_playlist.cpp common/utility/zstrformat.cpp common/utility/name.cpp - common/utility/m_bbox.cpp + common/utility/r_memory.cpp common/thirdparty/md5.cpp common/thirdparty/superfasthash.cpp common/filesystem/filesystem.cpp diff --git a/src/common/platform/posix/i_system_posix.cpp b/src/common/platform/posix/i_system_posix.cpp index cef139be45..46be3f0526 100644 --- a/src/common/platform/posix/i_system_posix.cpp +++ b/src/common/platform/posix/i_system_posix.cpp @@ -1,24 +1,33 @@ -//----------------------------------------------------------------------------- -// -// Copyright 1993-1996 id Software -// Copyright 1999-2016 Randy Heit -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see http://www.gnu.org/licenses/ -// -//----------------------------------------------------------------------------- -// - +/* +**--------------------------------------------------------------------------- +** Copyright 2016 Randy Heit +** All rights reserved. +** +** Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions +** are met: +** +** 1. Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** 2. Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in the +** documentation and/or other materials provided with the distribution. +** 3. The name of the author may not be used to endorse or promote products +** derived from this software without specific prior written permission. +** +** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +** OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +** IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +** INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +** NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +**--------------------------------------------------------------------------- +** +*/ #include #ifdef __APPLE__ diff --git a/src/rendering/swrenderer/drawers/r_thread.h b/src/common/rendering/r_thread.h similarity index 98% rename from src/rendering/swrenderer/drawers/r_thread.h rename to src/common/rendering/r_thread.h index 0d45b2caca..87319cf0cd 100644 --- a/src/rendering/swrenderer/drawers/r_thread.h +++ b/src/common/rendering/r_thread.h @@ -22,12 +22,14 @@ #pragma once -#include "r_draw.h" #include #include #include #include #include +#include "templates.h" +#include "c_cvars.h" +#include "basics.h" // Use multiple threads when drawing EXTERN_CVAR(Int, r_multithreaded) diff --git a/src/common/utility/basics.h b/src/common/utility/basics.h index 503d3ea7ba..615789b58c 100644 --- a/src/common/utility/basics.h +++ b/src/common/utility/basics.h @@ -3,6 +3,9 @@ #include #include +#define MAXWIDTH 12000 +#define MAXHEIGHT 5000 + // // fixed point, 32bit as 16.16. // diff --git a/src/common/utility/m_bbox.cpp b/src/common/utility/m_bbox.cpp deleted file mode 100644 index d62c4ec5fe..0000000000 --- a/src/common/utility/m_bbox.cpp +++ /dev/null @@ -1,47 +0,0 @@ -//----------------------------------------------------------------------------- -// -// Copyright 1993-1996 id Software -// Copyright 1999-2016 Randy Heit -// Copyright 2002-2016 Christoph Oelckers -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see http://www.gnu.org/licenses/ -// -//----------------------------------------------------------------------------- -// -// DESCRIPTION: -// bounding box class -// -//----------------------------------------------------------------------------- - -#include "m_bbox.h" - -//========================================================================== -// -// -// -//========================================================================== - -void FBoundingBox::AddToBox (const DVector2 &pos) -{ - if (pos.X < m_Box[BOXLEFT]) - m_Box[BOXLEFT] = pos.X; - if (pos.X > m_Box[BOXRIGHT]) - m_Box[BOXRIGHT] = pos.X; - - if (pos.Y < m_Box[BOXBOTTOM]) - m_Box[BOXBOTTOM] = pos.Y; - if (pos.Y > m_Box[BOXTOP]) - m_Box[BOXTOP] = pos.Y; -} - diff --git a/src/common/utility/m_bbox.h b/src/common/utility/m_bbox.h index 0286ef2307..f117c290b9 100644 --- a/src/common/utility/m_bbox.h +++ b/src/common/utility/m_bbox.h @@ -1,28 +1,3 @@ -//----------------------------------------------------------------------------- -// -// Copyright 1993-1996 id Software -// Copyright 1999-2016 Randy Heit -// Copyright 2002-2016 Christoph Oelckers -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see http://www.gnu.org/licenses/ -// -//----------------------------------------------------------------------------- -// -// DESCRIPTION: -// Nil. -// -//----------------------------------------------------------------------------- #ifndef __M_BBOX_H__ #define __M_BBOX_H__ @@ -84,7 +59,18 @@ public: m_Box[BOXTOP] > box2.m_Box[BOXTOP] ? m_Box[BOXTOP] : box2.m_Box[BOXTOP]); } - void AddToBox(const DVector2 &pos); + void AddToBox(const DVector2 &pos) + { + if (pos.X < m_Box[BOXLEFT]) + m_Box[BOXLEFT] = pos.X; + if (pos.X > m_Box[BOXRIGHT]) + m_Box[BOXRIGHT] = pos.X; + + if (pos.Y < m_Box[BOXBOTTOM]) + m_Box[BOXBOTTOM] = pos.Y; + if (pos.Y > m_Box[BOXTOP]) + m_Box[BOXTOP] = pos.Y; + } inline double Top () const { return m_Box[BOXTOP]; } inline double Bottom () const { return m_Box[BOXBOTTOM]; } diff --git a/src/rendering/swrenderer/r_memory.cpp b/src/common/utility/r_memory.cpp similarity index 62% rename from src/rendering/swrenderer/r_memory.cpp rename to src/common/utility/r_memory.cpp index 0a29a5314b..99a75d0f7a 100644 --- a/src/rendering/swrenderer/r_memory.cpp +++ b/src/common/utility/r_memory.cpp @@ -1,22 +1,24 @@ -//----------------------------------------------------------------------------- -// -// Copyright 1999-2016 Randy Heit -// Copyright 2016 Magnus Norddahl -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see http://www.gnu.org/licenses/ -// -//----------------------------------------------------------------------------- +/* +** Render memory allocation +** Copyright (c) 2016-2020 Magnus Norddahl +** +** This software is provided 'as-is', without any express or implied +** warranty. In no event will the authors be held liable for any damages +** arising from the use of this software. +** +** Permission is granted to anyone to use this software for any purpose, +** including commercial applications, and to alter it and redistribute it +** freely, subject to the following restrictions: +** +** 1. The origin of this software must not be misrepresented; you must not +** claim that you wrote the original software. If you use this software +** in a product, an acknowledgment in the product documentation would be +** appreciated but is not required. +** 2. Altered source versions must be plainly marked as such, and must not be +** misrepresented as being the original software. +** 3. This notice may not be removed or altered from any source distribution. +** +*/ #include #include "templates.h" diff --git a/src/rendering/swrenderer/r_memory.h b/src/common/utility/r_memory.h similarity index 100% rename from src/rendering/swrenderer/r_memory.h rename to src/common/utility/r_memory.h diff --git a/src/gamedata/r_defs.h b/src/gamedata/r_defs.h index f26724dec8..a5e73a186e 100644 --- a/src/gamedata/r_defs.h +++ b/src/gamedata/r_defs.h @@ -57,9 +57,6 @@ class AActor; struct FSection; struct FLevelLocals; -#define MAXWIDTH 12000 -#define MAXHEIGHT 5000 - const uint16_t NO_INDEX = 0xffffu; const uint32_t NO_SIDE = 0xffffffffu; diff --git a/src/rendering/polyrenderer/backend/poly_framebuffer.cpp b/src/rendering/polyrenderer/backend/poly_framebuffer.cpp index bc02d501aa..19ecb68711 100644 --- a/src/rendering/polyrenderer/backend/poly_framebuffer.cpp +++ b/src/rendering/polyrenderer/backend/poly_framebuffer.cpp @@ -28,6 +28,7 @@ #include "v_text.h" #include "i_video.h" #include "v_draw.h" +#include "colormaps.h" #include "hw_clock.h" #include "hw_vrmodes.h" @@ -404,12 +405,14 @@ void PolyFrameBuffer::BeginFrame() SetViewportRects(nullptr); CheckCanvas(); +#if 0 swrenderer::R_InitFuzzTable(GetCanvas()->GetPitch()); static int next_random = 0; swrenderer::fuzzpos = (swrenderer::fuzzpos + swrenderer::fuzz_random_x_offset[next_random] * FUZZTABLE / 100) % FUZZTABLE; next_random++; if (next_random == FUZZ_RANDOM_X_SIZE) next_random = 0; +#endif } void PolyFrameBuffer::Draw2D() diff --git a/src/rendering/polyrenderer/backend/poly_framebuffer.h b/src/rendering/polyrenderer/backend/poly_framebuffer.h index 200abce3a1..8ba6592726 100644 --- a/src/rendering/polyrenderer/backend/poly_framebuffer.h +++ b/src/rendering/polyrenderer/backend/poly_framebuffer.h @@ -1,8 +1,8 @@ #pragma once #include "gl_sysfb.h" -#include "rendering/swrenderer/r_memory.h" -#include "rendering/swrenderer/drawers/r_thread.h" +#include "r_memory.h" +#include "r_thread.h" #include "rendering/polyrenderer/drawers/poly_triangle.h" struct FRenderViewpoint; diff --git a/src/rendering/polyrenderer/backend/poly_renderstate.h b/src/rendering/polyrenderer/backend/poly_renderstate.h index 733578dd91..a99a9eab56 100644 --- a/src/rendering/polyrenderer/backend/poly_renderstate.h +++ b/src/rendering/polyrenderer/backend/poly_renderstate.h @@ -6,7 +6,6 @@ #include "name.h" -#include "hwrenderer/scene/hw_drawstructs.h" #include "hw_renderstate.h" #include "hw_material.h" diff --git a/src/rendering/polyrenderer/drawers/poly_thread.cpp b/src/rendering/polyrenderer/drawers/poly_thread.cpp index 4b6d1a51a4..809ebca49f 100644 --- a/src/rendering/polyrenderer/drawers/poly_thread.cpp +++ b/src/rendering/polyrenderer/drawers/poly_thread.cpp @@ -22,23 +22,18 @@ #include #include "templates.h" -#include "doomdef.h" #include "filesystem.h" #include "v_video.h" -#include "doomstat.h" -#include "st_stuff.h" -#include "g_game.h" -#include "g_level.h" -#include "r_data/r_translate.h" #include "model.h" -#include "v_palette.h" -#include "r_data/colormaps.h" #include "poly_thread.h" -#include "swrenderer/drawers/r_draw_rgba.h" #include "screen_triangle.h" #include "x86.h" +#ifndef NO_SSE +#include +#endif + PolyTriangleThreadData::PolyTriangleThreadData(int32_t core, int32_t num_cores, int32_t numa_node, int32_t num_numa_nodes, int numa_start_y, int numa_end_y) : core(core), num_cores(num_cores), numa_node(numa_node), num_numa_nodes(num_numa_nodes), numa_start_y(numa_start_y), numa_end_y(numa_end_y) { diff --git a/src/rendering/polyrenderer/drawers/poly_triangle.cpp b/src/rendering/polyrenderer/drawers/poly_triangle.cpp index 54676b9479..772c7ad7c9 100644 --- a/src/rendering/polyrenderer/drawers/poly_triangle.cpp +++ b/src/rendering/polyrenderer/drawers/poly_triangle.cpp @@ -22,21 +22,12 @@ #include #include "templates.h" -#include "doomdef.h" #include "filesystem.h" #include "v_video.h" -#include "doomstat.h" -#include "st_stuff.h" -#include "g_game.h" -#include "g_level.h" -#include "r_data/r_translate.h" #include "model.h" -#include "v_palette.h" -#include "r_data/colormaps.h" #include "poly_triangle.h" #include "poly_thread.h" -#include "swrenderer/drawers/r_draw_rgba.h" #include "screen_triangle.h" #include "x86.h" diff --git a/src/rendering/polyrenderer/drawers/poly_triangle.h b/src/rendering/polyrenderer/drawers/poly_triangle.h index ffee6201e4..ded2d65cbc 100644 --- a/src/rendering/polyrenderer/drawers/poly_triangle.h +++ b/src/rendering/polyrenderer/drawers/poly_triangle.h @@ -22,8 +22,8 @@ #pragma once -#include "swrenderer/drawers/r_draw.h" -#include "swrenderer/drawers/r_thread.h" +//#include "swrenderer/drawers/r_draw.h" +#include "r_thread.h" #include "polyrenderer/drawers/screen_triangle.h" #include "polyrenderer/drawers/poly_vertex_shader.h" diff --git a/src/rendering/polyrenderer/drawers/screen_blend.cpp b/src/rendering/polyrenderer/drawers/screen_blend.cpp index a8a7d1a8d2..8f05bbdd3f 100644 --- a/src/rendering/polyrenderer/drawers/screen_blend.cpp +++ b/src/rendering/polyrenderer/drawers/screen_blend.cpp @@ -22,6 +22,10 @@ #include "screen_blend.h" +#ifndef NO_SSE +#include +#endif + static const int shiftTable[] = { 0, 0, 0, 0, // STYLEALPHA_Zero 0, 0, 0, 0, // STYLEALPHA_One diff --git a/src/rendering/polyrenderer/drawers/screen_scanline_setup.cpp b/src/rendering/polyrenderer/drawers/screen_scanline_setup.cpp index 9f1a7af529..4b4ca47e87 100644 --- a/src/rendering/polyrenderer/drawers/screen_scanline_setup.cpp +++ b/src/rendering/polyrenderer/drawers/screen_scanline_setup.cpp @@ -22,12 +22,15 @@ #include #include "templates.h" -#include "doomdef.h" #include "poly_thread.h" #include "screen_scanline_setup.h" #include "x86.h" #include +#ifndef NO_SSE +#include +#endif + #ifdef NO_SSE void WriteW(int y, int x0, int x1, const TriDrawTriangleArgs* args, PolyTriangleThreadData* thread) { diff --git a/src/rendering/polyrenderer/drawers/screen_shader.cpp b/src/rendering/polyrenderer/drawers/screen_shader.cpp index af23172a6c..c4ceb02195 100644 --- a/src/rendering/polyrenderer/drawers/screen_shader.cpp +++ b/src/rendering/polyrenderer/drawers/screen_shader.cpp @@ -22,7 +22,6 @@ #include #include "templates.h" -#include "doomdef.h" #include "poly_thread.h" #include "screen_scanline_setup.h" #include "x86.h" diff --git a/src/rendering/polyrenderer/drawers/screen_triangle.cpp b/src/rendering/polyrenderer/drawers/screen_triangle.cpp index 45fe74b068..717f260a01 100644 --- a/src/rendering/polyrenderer/drawers/screen_triangle.cpp +++ b/src/rendering/polyrenderer/drawers/screen_triangle.cpp @@ -22,19 +22,10 @@ #include #include "templates.h" -#include "doomdef.h" #include "filesystem.h" #include "v_video.h" -#include "doomstat.h" -#include "st_stuff.h" -#include "g_game.h" -#include "g_level.h" -#include "r_data/r_translate.h" -#include "v_palette.h" -#include "r_data/colormaps.h" #include "poly_triangle.h" -#include "swrenderer/drawers/r_draw_rgba.h" #include "screen_triangle.h" #include "screen_blend.h" #include "screen_scanline_setup.h" diff --git a/src/rendering/polyrenderer/drawers/screen_triangle.h b/src/rendering/polyrenderer/drawers/screen_triangle.h index 7ccd644008..520ab4d000 100644 --- a/src/rendering/polyrenderer/drawers/screen_triangle.h +++ b/src/rendering/polyrenderer/drawers/screen_triangle.h @@ -25,7 +25,7 @@ #include #include #include "renderstyle.h" -#include "rendering/swrenderer/drawers/r_draw.h" +//#include "rendering/swrenderer/drawers/r_draw.h" class FString; class PolyTriangleThreadData; diff --git a/src/rendering/swrenderer/drawers/r_thread.cpp b/src/rendering/swrenderer/drawers/r_thread.cpp index a12562cc7e..e5c4f698ca 100644 --- a/src/rendering/swrenderer/drawers/r_thread.cpp +++ b/src/rendering/swrenderer/drawers/r_thread.cpp @@ -31,7 +31,7 @@ #include "g_game.h" #include "g_level.h" #include "r_thread.h" -#include "swrenderer/r_memory.h" +#include "r_memory.h" #include "swrenderer/r_renderthread.h" #include "polyrenderer/drawers/poly_triangle.h" #include diff --git a/src/rendering/swrenderer/line/r_farclip_line.cpp b/src/rendering/swrenderer/line/r_farclip_line.cpp index 6f4b919cf6..e0f0275789 100644 --- a/src/rendering/swrenderer/line/r_farclip_line.cpp +++ b/src/rendering/swrenderer/line/r_farclip_line.cpp @@ -40,7 +40,7 @@ #include "v_palette.h" #include "r_utility.h" #include "r_data/colormaps.h" -#include "swrenderer/r_memory.h" +#include "r_memory.h" #include "swrenderer/scene/r_opaque_pass.h" #include "swrenderer/scene/r_3dfloors.h" #include "swrenderer/scene/r_portal.h" diff --git a/src/rendering/swrenderer/line/r_fogboundary.cpp b/src/rendering/swrenderer/line/r_fogboundary.cpp index 03599193dc..1a6e405199 100644 --- a/src/rendering/swrenderer/line/r_fogboundary.cpp +++ b/src/rendering/swrenderer/line/r_fogboundary.cpp @@ -45,7 +45,7 @@ #include "swrenderer/segments/r_clipsegment.h" #include "swrenderer/segments/r_drawsegment.h" #include "swrenderer/line/r_fogboundary.h" -#include "swrenderer/r_memory.h" +#include "r_memory.h" #include "swrenderer/scene/r_light.h" #ifdef _MSC_VER diff --git a/src/rendering/swrenderer/line/r_line.cpp b/src/rendering/swrenderer/line/r_line.cpp index d6fb813214..eaa2a80b04 100644 --- a/src/rendering/swrenderer/line/r_line.cpp +++ b/src/rendering/swrenderer/line/r_line.cpp @@ -43,7 +43,7 @@ #include "r_utility.h" #include "r_data/colormaps.h" #include "texturemanager.h" -#include "swrenderer/r_memory.h" +#include "r_memory.h" #include "swrenderer/scene/r_opaque_pass.h" #include "swrenderer/scene/r_3dfloors.h" #include "swrenderer/scene/r_portal.h" diff --git a/src/rendering/swrenderer/line/r_renderdrawsegment.cpp b/src/rendering/swrenderer/line/r_renderdrawsegment.cpp index 041e96b181..b4c5fa544a 100644 --- a/src/rendering/swrenderer/line/r_renderdrawsegment.cpp +++ b/src/rendering/swrenderer/line/r_renderdrawsegment.cpp @@ -39,7 +39,7 @@ #include "r_data/colormaps.h" #include "d_net.h" #include "texturemanager.h" -#include "swrenderer/r_memory.h" +#include "r_memory.h" #include "swrenderer/r_renderthread.h" #include "swrenderer/drawers/r_draw.h" #include "swrenderer/scene/r_3dfloors.h" diff --git a/src/rendering/swrenderer/line/r_walldraw.cpp b/src/rendering/swrenderer/line/r_walldraw.cpp index 35f3403606..61945fefb0 100644 --- a/src/rendering/swrenderer/line/r_walldraw.cpp +++ b/src/rendering/swrenderer/line/r_walldraw.cpp @@ -50,7 +50,7 @@ #include "swrenderer/line/r_walldraw.h" #include "swrenderer/line/r_wallsetup.h" #include "swrenderer/r_renderthread.h" -#include "swrenderer/r_memory.h" +#include "r_memory.h" EXTERN_CVAR(Bool, r_fullbrightignoresectorcolor) diff --git a/src/rendering/swrenderer/line/r_wallsetup.cpp b/src/rendering/swrenderer/line/r_wallsetup.cpp index d1ccb1514a..1e70dc0af7 100644 --- a/src/rendering/swrenderer/line/r_wallsetup.cpp +++ b/src/rendering/swrenderer/line/r_wallsetup.cpp @@ -40,7 +40,7 @@ #include "v_palette.h" #include "r_data/colormaps.h" #include "r_walldraw.h" -#include "swrenderer/r_memory.h" +#include "r_memory.h" #include "swrenderer/line/r_line.h" #include "swrenderer/scene/r_scene.h" #include "swrenderer/scene/r_light.h" diff --git a/src/rendering/swrenderer/plane/r_flatplane.cpp b/src/rendering/swrenderer/plane/r_flatplane.cpp index e95bf450ef..9075fe9100 100644 --- a/src/rendering/swrenderer/plane/r_flatplane.cpp +++ b/src/rendering/swrenderer/plane/r_flatplane.cpp @@ -50,7 +50,7 @@ #include "swrenderer/scene/r_light.h" #include "swrenderer/plane/r_visibleplane.h" #include "swrenderer/viewport/r_viewport.h" -#include "swrenderer/r_memory.h" +#include "r_memory.h" #include "swrenderer/r_renderthread.h" namespace swrenderer diff --git a/src/rendering/swrenderer/plane/r_skyplane.cpp b/src/rendering/swrenderer/plane/r_skyplane.cpp index 4d1664948e..08a263a018 100644 --- a/src/rendering/swrenderer/plane/r_skyplane.cpp +++ b/src/rendering/swrenderer/plane/r_skyplane.cpp @@ -51,7 +51,7 @@ #include "swrenderer/scene/r_scene.h" #include "swrenderer/scene/r_light.h" #include "swrenderer/viewport/r_viewport.h" -#include "swrenderer/r_memory.h" +#include "r_memory.h" #include "swrenderer/r_renderthread.h" #include "g_levellocals.h" diff --git a/src/rendering/swrenderer/plane/r_slopeplane.cpp b/src/rendering/swrenderer/plane/r_slopeplane.cpp index 156576d8a4..6bc8e946ca 100644 --- a/src/rendering/swrenderer/plane/r_slopeplane.cpp +++ b/src/rendering/swrenderer/plane/r_slopeplane.cpp @@ -50,7 +50,7 @@ #include "swrenderer/scene/r_light.h" #include "swrenderer/viewport/r_viewport.h" #include "swrenderer/plane/r_visibleplane.h" -#include "swrenderer/r_memory.h" +#include "r_memory.h" #include "swrenderer/r_renderthread.h" #ifdef _MSC_VER diff --git a/src/rendering/swrenderer/plane/r_visibleplane.cpp b/src/rendering/swrenderer/plane/r_visibleplane.cpp index 889d2f0be0..c4b6c2b89b 100644 --- a/src/rendering/swrenderer/plane/r_visibleplane.cpp +++ b/src/rendering/swrenderer/plane/r_visibleplane.cpp @@ -38,7 +38,7 @@ #include "g_level.h" #include "a_dynlight.h" #include "texturemanager.h" -#include "swrenderer/r_memory.h" +#include "r_memory.h" #include "swrenderer/r_renderthread.h" #include "swrenderer/scene/r_opaque_pass.h" #include "swrenderer/scene/r_3dfloors.h" diff --git a/src/rendering/swrenderer/plane/r_visibleplane.h b/src/rendering/swrenderer/plane/r_visibleplane.h index afb493cfd4..101be05bc1 100644 --- a/src/rendering/swrenderer/plane/r_visibleplane.h +++ b/src/rendering/swrenderer/plane/r_visibleplane.h @@ -25,7 +25,7 @@ #include #include "r_defs.h" #include "r_state.h" -#include "swrenderer/r_memory.h" +#include "r_memory.h" struct FDynamicLight; struct FLightNode; diff --git a/src/rendering/swrenderer/plane/r_visibleplanelist.cpp b/src/rendering/swrenderer/plane/r_visibleplanelist.cpp index 50dc968970..a265be5d25 100644 --- a/src/rendering/swrenderer/plane/r_visibleplanelist.cpp +++ b/src/rendering/swrenderer/plane/r_visibleplanelist.cpp @@ -37,7 +37,7 @@ #include "d_net.h" #include "g_level.h" #include "a_dynlight.h" -#include "swrenderer/r_memory.h" +#include "r_memory.h" #include "swrenderer/scene/r_opaque_pass.h" #include "swrenderer/scene/r_3dfloors.h" #include "swrenderer/scene/r_portal.h" diff --git a/src/rendering/swrenderer/r_all.cpp b/src/rendering/swrenderer/r_all.cpp index c1dc53734c..a15525ecde 100644 --- a/src/rendering/swrenderer/r_all.cpp +++ b/src/rendering/swrenderer/r_all.cpp @@ -1,5 +1,4 @@ #include "textures/r_swtexture.h" -#include "r_memory.cpp" #include "r_renderthread.cpp" #include "r_swrenderer.cpp" #include "r_swcolormaps.cpp" diff --git a/src/rendering/swrenderer/r_renderthread.cpp b/src/rendering/swrenderer/r_renderthread.cpp index 036e297307..f2fb7bb99d 100644 --- a/src/rendering/swrenderer/r_renderthread.cpp +++ b/src/rendering/swrenderer/r_renderthread.cpp @@ -47,7 +47,7 @@ #include "swrenderer/plane/r_visibleplanelist.h" #include "swrenderer/segments/r_drawsegment.h" #include "swrenderer/segments/r_clipsegment.h" -#include "swrenderer/drawers/r_thread.h" +#include "r_thread.h" #include "swrenderer/drawers/r_draw.h" #include "swrenderer/drawers/r_draw_rgba.h" #include "swrenderer/drawers/r_draw_pal.h" diff --git a/src/rendering/swrenderer/scene/r_3dfloors.cpp b/src/rendering/swrenderer/scene/r_3dfloors.cpp index d468c9611e..8196462f46 100644 --- a/src/rendering/swrenderer/scene/r_3dfloors.cpp +++ b/src/rendering/swrenderer/scene/r_3dfloors.cpp @@ -41,7 +41,7 @@ #include "r_3dfloors.h" #include "r_utility.h" #include "swrenderer/r_renderthread.h" -#include "swrenderer/r_memory.h" +#include "r_memory.h" CVAR(Int, r_3dfloors, true, 0); diff --git a/src/rendering/swrenderer/scene/r_portal.cpp b/src/rendering/swrenderer/scene/r_portal.cpp index a39340c4d3..f0c914671c 100644 --- a/src/rendering/swrenderer/scene/r_portal.cpp +++ b/src/rendering/swrenderer/scene/r_portal.cpp @@ -65,7 +65,7 @@ #include "swrenderer/scene/r_scene.h" #include "swrenderer/scene/r_light.h" #include "swrenderer/viewport/r_viewport.h" -#include "swrenderer/r_memory.h" +#include "r_memory.h" #include "swrenderer/r_renderthread.h" CVAR(Int, r_portal_recursions, 4, CVAR_ARCHIVE) diff --git a/src/rendering/swrenderer/scene/r_scene.cpp b/src/rendering/swrenderer/scene/r_scene.cpp index e987ad5092..7c6e6f6a3d 100644 --- a/src/rendering/swrenderer/scene/r_scene.cpp +++ b/src/rendering/swrenderer/scene/r_scene.cpp @@ -53,8 +53,8 @@ #include "swrenderer/viewport/r_viewport.h" #include "swrenderer/drawers/r_draw.h" #include "swrenderer/drawers/r_draw_rgba.h" -#include "swrenderer/drawers/r_thread.h" -#include "swrenderer/r_memory.h" +#include "r_thread.h" +#include "r_memory.h" #include "swrenderer/r_renderthread.h" #include "swrenderer/things/r_playersprite.h" #include diff --git a/src/rendering/swrenderer/scene/r_translucent_pass.cpp b/src/rendering/swrenderer/scene/r_translucent_pass.cpp index 347c32140f..9d83549d07 100644 --- a/src/rendering/swrenderer/scene/r_translucent_pass.cpp +++ b/src/rendering/swrenderer/scene/r_translucent_pass.cpp @@ -44,7 +44,7 @@ #include "swrenderer/plane/r_visibleplanelist.h" #include "swrenderer/line/r_renderdrawsegment.h" #include "swrenderer/viewport/r_viewport.h" -#include "swrenderer/r_memory.h" +#include "r_memory.h" #include "swrenderer/r_renderthread.h" EXTERN_CVAR(Int, r_drawfuzz) diff --git a/src/rendering/swrenderer/segments/r_drawsegment.cpp b/src/rendering/swrenderer/segments/r_drawsegment.cpp index f90f8db55c..fd7517d723 100644 --- a/src/rendering/swrenderer/segments/r_drawsegment.cpp +++ b/src/rendering/swrenderer/segments/r_drawsegment.cpp @@ -36,7 +36,7 @@ #include "po_man.h" #include "r_data/colormaps.h" #include "d_net.h" -#include "swrenderer/r_memory.h" +#include "r_memory.h" #include "swrenderer/drawers/r_draw.h" #include "swrenderer/scene/r_3dfloors.h" #include "swrenderer/scene/r_opaque_pass.h" diff --git a/src/rendering/swrenderer/segments/r_portalsegment.cpp b/src/rendering/swrenderer/segments/r_portalsegment.cpp index 983921533d..d8aff120a0 100644 --- a/src/rendering/swrenderer/segments/r_portalsegment.cpp +++ b/src/rendering/swrenderer/segments/r_portalsegment.cpp @@ -39,7 +39,7 @@ #include "po_man.h" #include "r_data/colormaps.h" #include "swrenderer/segments/r_portalsegment.h" -#include "swrenderer/r_memory.h" +#include "r_memory.h" #include "swrenderer/r_renderthread.h" namespace swrenderer diff --git a/src/rendering/swrenderer/things/r_decal.cpp b/src/rendering/swrenderer/things/r_decal.cpp index fcc3055f43..df8f6fb387 100644 --- a/src/rendering/swrenderer/things/r_decal.cpp +++ b/src/rendering/swrenderer/things/r_decal.cpp @@ -51,7 +51,7 @@ #include "swrenderer/things/r_wallsprite.h" #include "swrenderer/viewport/r_viewport.h" #include "swrenderer/viewport/r_spritedrawer.h" -#include "swrenderer/r_memory.h" +#include "r_memory.h" #include "swrenderer/r_renderthread.h" namespace swrenderer diff --git a/src/rendering/swrenderer/things/r_model.cpp b/src/rendering/swrenderer/things/r_model.cpp index ec7a5273cc..b2dd3ed45c 100644 --- a/src/rendering/swrenderer/things/r_model.cpp +++ b/src/rendering/swrenderer/things/r_model.cpp @@ -30,7 +30,7 @@ #include "actorinlines.h" #include "i_time.h" #include "texturemanager.h" -#include "swrenderer/r_memory.h" +#include "r_memory.h" #include "swrenderer/r_swcolormaps.h" #include "swrenderer/viewport/r_viewport.h" #include "swrenderer/scene/r_light.h" diff --git a/src/rendering/swrenderer/things/r_particle.cpp b/src/rendering/swrenderer/things/r_particle.cpp index 4fbc97c388..a91ddb4739 100644 --- a/src/rendering/swrenderer/things/r_particle.cpp +++ b/src/rendering/swrenderer/things/r_particle.cpp @@ -62,7 +62,7 @@ #include "swrenderer/viewport/r_viewport.h" #include "swrenderer/drawers/r_draw_rgba.h" #include "swrenderer/drawers/r_draw_pal.h" -#include "swrenderer/r_memory.h" +#include "r_memory.h" #include "swrenderer/r_renderthread.h" EXTERN_CVAR(Bool, r_fullbrightignoresectorcolor); diff --git a/src/rendering/swrenderer/things/r_playersprite.cpp b/src/rendering/swrenderer/things/r_playersprite.cpp index 2b0825fb2f..3291de29c1 100644 --- a/src/rendering/swrenderer/things/r_playersprite.cpp +++ b/src/rendering/swrenderer/things/r_playersprite.cpp @@ -63,7 +63,7 @@ #include "swrenderer/scene/r_light.h" #include "swrenderer/things/r_sprite.h" #include "swrenderer/viewport/r_viewport.h" -#include "swrenderer/r_memory.h" +#include "r_memory.h" #include "swrenderer/r_renderthread.h" #include "g_levellocals.h" #include "v_draw.h" diff --git a/src/rendering/swrenderer/things/r_sprite.cpp b/src/rendering/swrenderer/things/r_sprite.cpp index 29afd0f7ea..1554379434 100644 --- a/src/rendering/swrenderer/things/r_sprite.cpp +++ b/src/rendering/swrenderer/things/r_sprite.cpp @@ -62,7 +62,7 @@ #include "swrenderer/scene/r_light.h" #include "swrenderer/things/r_sprite.h" #include "swrenderer/viewport/r_viewport.h" -#include "swrenderer/r_memory.h" +#include "r_memory.h" #include "swrenderer/r_renderthread.h" #include "a_dynlight.h" #include "r_data/r_vanillatrans.h" diff --git a/src/rendering/swrenderer/things/r_visiblesprite.cpp b/src/rendering/swrenderer/things/r_visiblesprite.cpp index 6a524c6e07..4102f912dd 100644 --- a/src/rendering/swrenderer/things/r_visiblesprite.cpp +++ b/src/rendering/swrenderer/things/r_visiblesprite.cpp @@ -42,7 +42,7 @@ #include "swrenderer/scene/r_portal.h" #include "swrenderer/scene/r_light.h" #include "swrenderer/viewport/r_viewport.h" -#include "swrenderer/r_memory.h" +#include "r_memory.h" #include "swrenderer/r_renderthread.h" EXTERN_CVAR(Bool, r_fullbrightignoresectorcolor); diff --git a/src/rendering/swrenderer/things/r_visiblespritelist.cpp b/src/rendering/swrenderer/things/r_visiblespritelist.cpp index 6c0f391740..99c3748ce1 100644 --- a/src/rendering/swrenderer/things/r_visiblespritelist.cpp +++ b/src/rendering/swrenderer/things/r_visiblespritelist.cpp @@ -32,7 +32,7 @@ #include "p_maputl.h" #include "swrenderer/things/r_visiblesprite.h" #include "swrenderer/things/r_visiblespritelist.h" -#include "swrenderer/r_memory.h" +#include "r_memory.h" namespace swrenderer { diff --git a/src/rendering/swrenderer/things/r_voxel.cpp b/src/rendering/swrenderer/things/r_voxel.cpp index 62e0e46559..5dfbb58844 100644 --- a/src/rendering/swrenderer/things/r_voxel.cpp +++ b/src/rendering/swrenderer/things/r_voxel.cpp @@ -44,7 +44,7 @@ #include "r_utility.h" #include "i_time.h" #include "swrenderer/drawers/r_draw.h" -#include "swrenderer/drawers/r_thread.h" +#include "r_thread.h" #include "swrenderer/things/r_visiblesprite.h" #include "swrenderer/things/r_voxel.h" #include "swrenderer/scene/r_portal.h" @@ -53,7 +53,7 @@ #include "swrenderer/scene/r_light.h" #include "swrenderer/viewport/r_viewport.h" #include "swrenderer/viewport/r_spritedrawer.h" -#include "swrenderer/r_memory.h" +#include "r_memory.h" #include "swrenderer/r_renderthread.h" EXTERN_CVAR(Bool, r_fullbrightignoresectorcolor) diff --git a/src/rendering/swrenderer/things/r_wallsprite.cpp b/src/rendering/swrenderer/things/r_wallsprite.cpp index 5fb431e36f..8ebf68dda3 100644 --- a/src/rendering/swrenderer/things/r_wallsprite.cpp +++ b/src/rendering/swrenderer/things/r_wallsprite.cpp @@ -64,7 +64,7 @@ #include "swrenderer/line/r_wallsetup.h" #include "swrenderer/line/r_walldraw.h" #include "swrenderer/viewport/r_viewport.h" -#include "swrenderer/r_memory.h" +#include "r_memory.h" #include "swrenderer/r_renderthread.h" namespace swrenderer