zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-28 23:11:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

- sanitized dependencies of the softpoly render backend.

Browse source 
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.
This commit is contained in:
Christoph Oelckers 2020-04-29 18:48:15 +02:00
parent 8cce6207c7
commit 68630d6782
50 changed files with 121 additions and 186 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/CMakeLists.txt
View file

@ -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

51
src/common/platform/posix/i_system_posix.cpp
View file

@ -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 <fnmatch.h>
#ifdef __APPLE__

4
src/rendering/swrenderer/drawers/r_thread.h → src/common/rendering/r_thread.h
View file

@ -22,12 +22,14 @@
#pragma once
#include "r_draw.h"
#include <vector>
#include <memory>
#include <thread>
#include <mutex>
#include <condition_variable>
#include "templates.h"
#include "c_cvars.h"
#include "basics.h"
// Use multiple threads when drawing
EXTERN_CVAR(Int, r_multithreaded)

3
src/common/utility/basics.h
View file

@ -3,6 +3,9 @@
#include <stddef.h>
#include <stdint.h>
#define MAXWIDTH 12000
#define MAXHEIGHT 5000
//
// fixed point, 32bit as 16.16.
//

47
src/common/utility/m_bbox.cpp
View file

@ -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;
}

38
src/common/utility/m_bbox.h
View file

@ -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]; }

40
src/rendering/swrenderer/r_memory.cpp → src/common/utility/r_memory.cpp
View file

@ -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 <stdlib.h>
#include "templates.h"

0
src/rendering/swrenderer/r_memory.h → src/common/utility/r_memory.h
View file

3
src/gamedata/r_defs.h
View file

@ -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;

3
src/rendering/polyrenderer/backend/poly_framebuffer.cpp
View file

@ -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()

4
src/rendering/polyrenderer/backend/poly_framebuffer.h
View file

@ -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;

1
src/rendering/polyrenderer/backend/poly_renderstate.h
View file

@ -6,7 +6,6 @@
#include "name.h"
#include "hwrenderer/scene/hw_drawstructs.h"
#include "hw_renderstate.h"
#include "hw_material.h"

13
src/rendering/polyrenderer/drawers/poly_thread.cpp
View file

@ -22,23 +22,18 @@
#include <stddef.h>
#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 <immintrin.h>
#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)
{

9
src/rendering/polyrenderer/drawers/poly_triangle.cpp
View file

@ -22,21 +22,12 @@
#include <stddef.h>
#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"

4
src/rendering/polyrenderer/drawers/poly_triangle.h
View file

@ -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"

4
src/rendering/polyrenderer/drawers/screen_blend.cpp
View file

@ -22,6 +22,10 @@
#include "screen_blend.h"
#ifndef NO_SSE
#include <immintrin.h>
#endif
static const int shiftTable[] = {
0, 0, 0, 0, // STYLEALPHA_Zero
0, 0, 0, 0, // STYLEALPHA_One

5
src/rendering/polyrenderer/drawers/screen_scanline_setup.cpp
View file

@ -22,12 +22,15 @@
#include <stddef.h>
#include "templates.h"
#include "doomdef.h"
#include "poly_thread.h"
#include "screen_scanline_setup.h"
#include "x86.h"
#include <cmath>
#ifndef NO_SSE
#include <immintrin.h>
#endif
#ifdef NO_SSE
void WriteW(int y, int x0, int x1, const TriDrawTriangleArgs* args, PolyTriangleThreadData* thread)
{

1
src/rendering/polyrenderer/drawers/screen_shader.cpp
View file

@ -22,7 +22,6 @@
#include <stddef.h>
#include "templates.h"
#include "doomdef.h"
#include "poly_thread.h"
#include "screen_scanline_setup.h"
#include "x86.h"

9
src/rendering/polyrenderer/drawers/screen_triangle.cpp
View file

@ -22,19 +22,10 @@
#include <stddef.h>
#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"

2
src/rendering/polyrenderer/drawers/screen_triangle.h
View file

@ -25,7 +25,7 @@
#include <cstdint>
#include <vector>
#include "renderstyle.h"
#include "rendering/swrenderer/drawers/r_draw.h"
//#include "rendering/swrenderer/drawers/r_draw.h"
class FString;
class PolyTriangleThreadData;

2
src/rendering/swrenderer/drawers/r_thread.cpp
View file

@ -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 <chrono>

2
src/rendering/swrenderer/line/r_farclip_line.cpp
View file

@ -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"

2
src/rendering/swrenderer/line/r_fogboundary.cpp
View file

@ -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

2
src/rendering/swrenderer/line/r_line.cpp
View file

@ -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"

2
src/rendering/swrenderer/line/r_renderdrawsegment.cpp
View file

@ -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"

2
src/rendering/swrenderer/line/r_walldraw.cpp
View file

@ -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)

2
src/rendering/swrenderer/line/r_wallsetup.cpp
View file

@ -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"

2
src/rendering/swrenderer/plane/r_flatplane.cpp
View file

@ -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

2
src/rendering/swrenderer/plane/r_skyplane.cpp
View file

@ -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"

2
src/rendering/swrenderer/plane/r_slopeplane.cpp
View file

@ -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

2
src/rendering/swrenderer/plane/r_visibleplane.cpp
View file

@ -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"

2
src/rendering/swrenderer/plane/r_visibleplane.h
View file

@ -25,7 +25,7 @@
#include <stddef.h>
#include "r_defs.h"
#include "r_state.h"
#include "swrenderer/r_memory.h"
#include "r_memory.h"
struct FDynamicLight;
struct FLightNode;

2
src/rendering/swrenderer/plane/r_visibleplanelist.cpp
View file

@ -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"

1
src/rendering/swrenderer/r_all.cpp
View file

@ -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"

2
src/rendering/swrenderer/r_renderthread.cpp
View file

@ -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"

2
src/rendering/swrenderer/scene/r_3dfloors.cpp
View file

@ -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);

2
src/rendering/swrenderer/scene/r_portal.cpp
View file

@ -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)

4
src/rendering/swrenderer/scene/r_scene.cpp
View file

@ -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 <chrono>

2
src/rendering/swrenderer/scene/r_translucent_pass.cpp
View file

@ -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)

2
src/rendering/swrenderer/segments/r_drawsegment.cpp
View file

@ -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"

2
src/rendering/swrenderer/segments/r_portalsegment.cpp
View file

@ -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

2
src/rendering/swrenderer/things/r_decal.cpp
View file

@ -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

2
src/rendering/swrenderer/things/r_model.cpp
View file

@ -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"

2
src/rendering/swrenderer/things/r_particle.cpp
View file

@ -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);

2
src/rendering/swrenderer/things/r_playersprite.cpp
View file

@ -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"

2
src/rendering/swrenderer/things/r_sprite.cpp
View file

@ -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"

2
src/rendering/swrenderer/things/r_visiblesprite.cpp
View file

@ -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);

2
src/rendering/swrenderer/things/r_visiblespritelist.cpp
View file

@ -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
{

4
src/rendering/swrenderer/things/r_voxel.cpp
View file

@ -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)

2
src/rendering/swrenderer/things/r_wallsprite.cpp
View file

@ -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