From d84554f093461e6a062dc09adefd22caf9e291c7 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 2 Apr 2018 00:28:25 +0200 Subject: [PATCH] - deleting some unused stuff --- src/gl/scene/gl_scene.cpp | 24 +----------------------- src/p_saveg.cpp | 3 --- src/p_setup.cpp | 1 - src/r_renderer.h | 5 ----- src/swrenderer/r_swrenderer.cpp | 4 ---- src/swrenderer/r_swrenderer.h | 1 - 6 files changed, 1 insertion(+), 37 deletions(-) diff --git a/src/gl/scene/gl_scene.cpp b/src/gl/scene/gl_scene.cpp index c78c9190cf..2517e23ad3 100644 --- a/src/gl/scene/gl_scene.cpp +++ b/src/gl/scene/gl_scene.cpp @@ -42,7 +42,6 @@ #include "po_man.h" #include "r_utility.h" #include "p_local.h" -#include "gl/gl_functions.h" #include "serializer.h" #include "g_levellocals.h" #include "events.h" @@ -1003,11 +1002,8 @@ struct FGLInterface : public FRenderer void Precache(uint8_t *texhitlist, TMap &actorhitlist) override; void RenderView(player_t *player) override; void WriteSavePic (player_t *player, FileWriter *file, int width, int height) override; - void StartSerialize(FSerializer &arc) override; - void EndSerialize(FSerializer &arc) override; void RenderTextureView (FCanvasTexture *self, AActor *viewpoint, double fov) override; void PreprocessLevel() override; - void CleanLevelData() override; int GetMaxViewPitch(bool down) override; void SetClearColor(int color) override; @@ -1026,20 +1022,6 @@ void FGLInterface::Precache(uint8_t *texhitlist, TMap &actor gl_PrecacheTexture(texhitlist, actorhitlist); } -//=========================================================================== -// -// notify the renderer that serialization of the curent level is about to start/end -// -//=========================================================================== - -void FGLInterface::StartSerialize(FSerializer &arc) -{ -} - -void FGLInterface::EndSerialize(FSerializer &arc) -{ -} - //=========================================================================== // // Get max. view angle (renderer specific information so it goes here now) @@ -1147,16 +1129,12 @@ void FGLInterface::RenderTextureView (FCanvasTexture *tex, AActor *Viewpoint, do // // //=========================================================================== - +void gl_PreprocessLevel(); void FGLInterface::PreprocessLevel() { gl_PreprocessLevel(); } -void FGLInterface::CleanLevelData() -{ -} - uint32_t FGLInterface::GetCaps() { // describe our basic feature set diff --git a/src/p_saveg.cpp b/src/p_saveg.cpp index b3856cfe02..cf79afc6f1 100644 --- a/src/p_saveg.cpp +++ b/src/p_saveg.cpp @@ -943,7 +943,6 @@ void G_SerializeLevel(FSerializer &arc, bool hubload) } arc("saveversion", SaveVersion); - Renderer->StartSerialize(arc); if (arc.isReading()) { DThinker::DestroyAllThinkers(); @@ -1025,6 +1024,4 @@ void G_SerializeLevel(FSerializer &arc, bool hubload) } AActor::RecreateAllAttachedLights(); InitPortalGroups(); - Renderer->EndSerialize(arc); - } diff --git a/src/p_setup.cpp b/src/p_setup.cpp index 59b93b97a5..98c20b1cbb 100644 --- a/src/p_setup.cpp +++ b/src/p_setup.cpp @@ -3532,7 +3532,6 @@ void P_FreeLevelData () AActor::ClearTIDHashes(); interpolator.ClearInterpolations(); // [RH] Nothing to interpolate on a fresh level. - Renderer->CleanLevelData(); FPolyObj::ClearAllSubsectorLinks(); // can't be done as part of the polyobj deletion process. SN_StopAllSequences (); DThinker::DestroyAllThinkers (); diff --git a/src/r_renderer.h b/src/r_renderer.h index fa73ea2b18..d8426d221d 100644 --- a/src/r_renderer.h +++ b/src/r_renderer.h @@ -40,17 +40,12 @@ struct FRenderer // draws player sprites with hardware acceleration (only useful for software rendering) virtual void DrawRemainingPlayerSprites() {} - // notify the renderer that serialization of the curent level is about to start/end - virtual void StartSerialize(FSerializer &arc) {} - virtual void EndSerialize(FSerializer &arc) {} - virtual int GetMaxViewPitch(bool down) = 0; // return value is in plain degrees virtual void OnModeSet () {} virtual void SetClearColor(int color) = 0; virtual void RenderTextureView (FCanvasTexture *tex, AActor *viewpoint, double fov) = 0; virtual void PreprocessLevel() {} - virtual void CleanLevelData() {} virtual uint32_t GetCaps() { return 0; } }; diff --git a/src/swrenderer/r_swrenderer.cpp b/src/swrenderer/r_swrenderer.cpp index 89bb8e728d..5a400e4cac 100644 --- a/src/swrenderer/r_swrenderer.cpp +++ b/src/swrenderer/r_swrenderer.cpp @@ -365,10 +365,6 @@ void FSoftwareRenderer::PreprocessLevel() } } -void FSoftwareRenderer::CleanLevelData() -{ -} - uint32_t FSoftwareRenderer::GetCaps() { ActorRenderFeatureFlags FlagSet = 0; diff --git a/src/swrenderer/r_swrenderer.h b/src/swrenderer/r_swrenderer.h index 75af702a70..32bcdcc399 100644 --- a/src/swrenderer/r_swrenderer.h +++ b/src/swrenderer/r_swrenderer.h @@ -31,7 +31,6 @@ struct FSoftwareRenderer : public FRenderer void RenderTextureView (FCanvasTexture *tex, AActor *viewpoint, double fov) override; void PreprocessLevel() override; - void CleanLevelData() override; uint32_t GetCaps() override;