From 628f6c32d975449fdc711f9337bc9f5cbc3caffe Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Sun, 10 Jun 2018 12:54:37 +0200 Subject: [PATCH] - remove unused DrawerCommand::DebugInfo --- src/polyrenderer/drawers/poly_triangle.h | 8 ---- src/swrenderer/drawers/r_draw.cpp | 4 -- src/swrenderer/drawers/r_draw_pal.cpp | 10 ----- src/swrenderer/drawers/r_draw_pal.h | 10 ----- src/swrenderer/drawers/r_draw_rgba.cpp | 40 ------------------- src/swrenderer/drawers/r_draw_rgba.h | 9 ----- src/swrenderer/drawers/r_draw_sky32.h | 4 -- src/swrenderer/drawers/r_draw_sky32_sse2.h | 4 -- src/swrenderer/drawers/r_draw_span32.h | 2 - src/swrenderer/drawers/r_draw_span32_sse2.h | 2 - src/swrenderer/drawers/r_draw_sprite32.h | 2 - src/swrenderer/drawers/r_draw_sprite32_sse2.h | 2 - src/swrenderer/drawers/r_draw_wall32.h | 2 - src/swrenderer/drawers/r_draw_wall32_sse2.h | 2 - src/swrenderer/drawers/r_thread.h | 1 - 15 files changed, 102 deletions(-) diff --git a/src/polyrenderer/drawers/poly_triangle.h b/src/polyrenderer/drawers/poly_triangle.h index c63e2e6ac..a92011c71 100644 --- a/src/polyrenderer/drawers/poly_triangle.h +++ b/src/polyrenderer/drawers/poly_triangle.h @@ -101,7 +101,6 @@ public: PolySetTransformCommand(const Mat4f *objectToClip, const Mat4f *objectToWorld); void Execute(DrawerThread *thread) override; - FString DebugInfo() override { return "PolySetTransform"; } private: const Mat4f *objectToClip; @@ -114,7 +113,6 @@ public: PolySetCullCCWCommand(bool ccw); void Execute(DrawerThread *thread) override; - FString DebugInfo() override { return "PolySetCullCCWCommand"; } private: bool ccw; @@ -126,7 +124,6 @@ public: PolySetTwoSidedCommand(bool twosided); void Execute(DrawerThread *thread) override; - FString DebugInfo() override { return "PolySetCullCCWCommand"; } private: bool twosided; @@ -138,7 +135,6 @@ public: PolySetWeaponSceneCommand(bool value); void Execute(DrawerThread *thread) override; - FString DebugInfo() override { return "PolySetWeaponSceneCommand"; } private: bool value; @@ -150,7 +146,6 @@ public: PolyClearStencilCommand(uint8_t value); void Execute(DrawerThread *thread) override; - FString DebugInfo() override { return "PolyClearStencilCommand"; } private: uint8_t value; @@ -162,7 +157,6 @@ public: PolySetViewportCommand(int x, int y, int width, int height, uint8_t *dest, int dest_width, int dest_height, int dest_pitch, bool dest_bgra); void Execute(DrawerThread *thread) override; - FString DebugInfo() override { return "PolySetViewport"; } private: int x; @@ -182,7 +176,6 @@ public: DrawPolyTrianglesCommand(const PolyDrawArgs &args); void Execute(DrawerThread *thread) override; - FString DebugInfo() override { return "DrawPolyTriangles"; } private: PolyDrawArgs args; @@ -194,7 +187,6 @@ public: DrawRectCommand(const RectDrawArgs &args) : args(args) { } void Execute(DrawerThread *thread) override; - FString DebugInfo() override { return "DrawRect"; } private: RectDrawArgs args; diff --git a/src/swrenderer/drawers/r_draw.cpp b/src/swrenderer/drawers/r_draw.cpp index 8e260daa7..8dfddb832 100644 --- a/src/swrenderer/drawers/r_draw.cpp +++ b/src/swrenderer/drawers/r_draw.cpp @@ -267,8 +267,6 @@ namespace swrenderer count = args.Count(); } - FString DebugInfo() override { return "DepthColumnCommand"; } - void Execute(DrawerThread *thread) override { auto zbuffer = PolyZBuffer::Instance(); @@ -308,8 +306,6 @@ namespace swrenderer #endif } - FString DebugInfo() override { return "DepthSpanCommand"; } - void Execute(DrawerThread *thread) override { if (thread->skipped_by_thread(y)) diff --git a/src/swrenderer/drawers/r_draw_pal.cpp b/src/swrenderer/drawers/r_draw_pal.cpp index 68ea09c13..b9501d157 100644 --- a/src/swrenderer/drawers/r_draw_pal.cpp +++ b/src/swrenderer/drawers/r_draw_pal.cpp @@ -3060,11 +3060,6 @@ namespace swrenderer } } - FString DrawParticleColumnPalCommand::DebugInfo() - { - return "DrawParticle"; - } - ///////////////////////////////////////////////////////////////////////////// DrawVoxelBlocksPalCommand::DrawVoxelBlocksPalCommand(const SpriteDrawerArgs &args, const VoxelBlock *blocks, int blockcount) : args(args), blocks(blocks), blockcount(blockcount) @@ -3162,9 +3157,4 @@ namespace swrenderer } } } - - FString DrawVoxelBlocksPalCommand::DebugInfo() - { - return "DrawVoxelBlocks"; - } } diff --git a/src/swrenderer/drawers/r_draw_pal.h b/src/swrenderer/drawers/r_draw_pal.h index 76fdb9eb4..40349dc44 100644 --- a/src/swrenderer/drawers/r_draw_pal.h +++ b/src/swrenderer/drawers/r_draw_pal.h @@ -15,7 +15,6 @@ namespace swrenderer { public: PalWall1Command(const WallDrawerArgs &args); - FString DebugInfo() override { return "PalWallCommand"; } protected: inline static uint8_t AddLights(const DrawerLight *lights, int num_lights, float viewpos_z, uint8_t fg, uint8_t material); @@ -34,7 +33,6 @@ namespace swrenderer { public: PalSkyCommand(const SkyDrawerArgs &args); - FString DebugInfo() override { return "PalSkyCommand"; } protected: SkyDrawerArgs args; @@ -47,7 +45,6 @@ namespace swrenderer { public: PalColumnCommand(const SpriteDrawerArgs &args); - FString DebugInfo() override { return "PalColumnCommand"; } SpriteDrawerArgs args; @@ -78,7 +75,6 @@ namespace swrenderer public: DrawFuzzColumnPalCommand(const SpriteDrawerArgs &args); void Execute(DrawerThread *thread) override; - FString DebugInfo() override { return "DrawFuzzColumnPalCommand"; } private: int _yl; @@ -95,7 +91,6 @@ namespace swrenderer public: DrawScaledFuzzColumnPalCommand(const SpriteDrawerArgs &drawerargs); void Execute(DrawerThread *thread) override; - FString DebugInfo() override { return "DrawScaledFuzzColumnPalCommand"; } private: int _x; @@ -111,7 +106,6 @@ namespace swrenderer { public: PalSpanCommand(const SpanDrawerArgs &args); - FString DebugInfo() override { return "PalSpanCommand"; } protected: inline static uint8_t AddLights(const DrawerLight *lights, int num_lights, float viewpos_x, uint8_t fg, uint8_t material); @@ -152,7 +146,6 @@ namespace swrenderer public: DrawTiltedSpanPalCommand(const SpanDrawerArgs &args, const FVector3 &plane_sz, const FVector3 &plane_su, const FVector3 &plane_sv, bool plane_shade, int planeshade, float planelightfloat, fixed_t pviewx, fixed_t pviewy, FDynamicColormap *basecolormap); void Execute(DrawerThread *thread) override; - FString DebugInfo() override { return "DrawTiltedSpanPalCommand"; } private: void CalcTiltedLighting(double lval, double lend, int width, DrawerThread *thread); @@ -183,7 +176,6 @@ namespace swrenderer public: DrawColoredSpanPalCommand(const SpanDrawerArgs &args); void Execute(DrawerThread *thread) override; - FString DebugInfo() override { return "DrawColoredSpanPalCommand"; } private: int y; @@ -210,7 +202,6 @@ namespace swrenderer public: DrawParticleColumnPalCommand(uint8_t *dest, int dest_y, int pitch, int count, uint32_t fg, uint32_t alpha, uint32_t fracposx); void Execute(DrawerThread *thread) override; - FString DebugInfo() override; private: uint8_t *_dest; @@ -227,7 +218,6 @@ namespace swrenderer public: DrawVoxelBlocksPalCommand(const SpriteDrawerArgs &args, const VoxelBlock *blocks, int blockcount); void Execute(DrawerThread *thread) override; - FString DebugInfo() override; private: SpriteDrawerArgs args; diff --git a/src/swrenderer/drawers/r_draw_rgba.cpp b/src/swrenderer/drawers/r_draw_rgba.cpp index 23066986d..f43831d65 100644 --- a/src/swrenderer/drawers/r_draw_rgba.cpp +++ b/src/swrenderer/drawers/r_draw_rgba.cpp @@ -307,11 +307,6 @@ namespace swrenderer } } - FString DrawScaledFuzzColumnRGBACommand::DebugInfo() - { - return "DrawScaledFuzzColumn"; - } - ///////////////////////////////////////////////////////////////////////////// DrawFuzzColumnRGBACommand::DrawFuzzColumnRGBACommand(const SpriteDrawerArgs &drawerargs) @@ -446,11 +441,6 @@ namespace swrenderer #endif } - FString DrawFuzzColumnRGBACommand::DebugInfo() - { - return "DrawFuzzColumn"; - } - ///////////////////////////////////////////////////////////////////////////// FillSpanRGBACommand::FillSpanRGBACommand(const SpanDrawerArgs &drawerargs) @@ -476,11 +466,6 @@ namespace swrenderer dest[i] = color; } - FString FillSpanRGBACommand::DebugInfo() - { - return "FillSpan"; - } - ///////////////////////////////////////////////////////////////////////////// DrawFogBoundaryLineRGBACommand::DrawFogBoundaryLineRGBACommand(const SpanDrawerArgs &drawerargs) @@ -543,11 +528,6 @@ namespace swrenderer } while (++x <= x2); } - FString DrawFogBoundaryLineRGBACommand::DebugInfo() - { - return "DrawFogBoundaryLine"; - } - ///////////////////////////////////////////////////////////////////////////// DrawTiltedSpanRGBACommand::DrawTiltedSpanRGBACommand(const SpanDrawerArgs &drawerargs, const FVector3 &plane_sz, const FVector3 &plane_su, const FVector3 &plane_sv, bool plane_shade, int planeshade, float planelightfloat, fixed_t pviewx, fixed_t pviewy) @@ -678,11 +658,6 @@ namespace swrenderer } } - FString DrawTiltedSpanRGBACommand::DebugInfo() - { - return "DrawTiltedSpan"; - } - ///////////////////////////////////////////////////////////////////////////// DrawColoredSpanRGBACommand::DrawColoredSpanRGBACommand(const SpanDrawerArgs &drawerargs) @@ -712,11 +687,6 @@ namespace swrenderer dest[i] = color; } - FString DrawColoredSpanRGBACommand::DebugInfo() - { - return "DrawColoredSpan"; - } - ///////////////////////////////////////////////////////////////////////////// #if 0 @@ -926,11 +896,6 @@ namespace swrenderer } } - FString DrawParticleColumnRGBACommand::DebugInfo() - { - return "DrawParticle"; - } - ///////////////////////////////////////////////////////////////////////////// DrawVoxelBlocksRGBACommand::DrawVoxelBlocksRGBACommand(const SpriteDrawerArgs &args, const VoxelBlock *blocks, int blockcount) : args(args), blocks(blocks), blockcount(blockcount) @@ -966,9 +931,4 @@ namespace swrenderer } } } - - FString DrawVoxelBlocksRGBACommand::DebugInfo() - { - return "DrawVoxelBlocks"; - } } diff --git a/src/swrenderer/drawers/r_draw_rgba.h b/src/swrenderer/drawers/r_draw_rgba.h index ee23a3efe..496564673 100644 --- a/src/swrenderer/drawers/r_draw_rgba.h +++ b/src/swrenderer/drawers/r_draw_rgba.h @@ -83,7 +83,6 @@ namespace swrenderer public: DrawFuzzColumnRGBACommand(const SpriteDrawerArgs &drawerargs); void Execute(DrawerThread *thread) override; - FString DebugInfo() override; }; class DrawScaledFuzzColumnRGBACommand : public DrawerCommand @@ -99,7 +98,6 @@ namespace swrenderer public: DrawScaledFuzzColumnRGBACommand(const SpriteDrawerArgs &drawerargs); void Execute(DrawerThread *thread) override; - FString DebugInfo() override; }; class FillSpanRGBACommand : public DrawerCommand @@ -114,7 +112,6 @@ namespace swrenderer public: FillSpanRGBACommand(const SpanDrawerArgs &drawerargs); void Execute(DrawerThread *thread) override; - FString DebugInfo() override; }; class DrawFogBoundaryLineRGBACommand : public DrawerCommand @@ -129,7 +126,6 @@ namespace swrenderer public: DrawFogBoundaryLineRGBACommand(const SpanDrawerArgs &drawerargs); void Execute(DrawerThread *thread) override; - FString DebugInfo() override; }; class DrawTiltedSpanRGBACommand : public DrawerCommand @@ -156,7 +152,6 @@ namespace swrenderer public: DrawTiltedSpanRGBACommand(const SpanDrawerArgs &drawerargs, const FVector3 &plane_sz, const FVector3 &plane_su, const FVector3 &plane_sv, bool plane_shade, int planeshade, float planelightfloat, fixed_t pviewx, fixed_t pviewy); void Execute(DrawerThread *thread) override; - FString DebugInfo() override; }; class DrawColoredSpanRGBACommand : public DrawerCommand @@ -172,7 +167,6 @@ namespace swrenderer DrawColoredSpanRGBACommand(const SpanDrawerArgs &drawerargs); void Execute(DrawerThread *thread) override; - FString DebugInfo() override; }; #if 0 @@ -192,7 +186,6 @@ namespace swrenderer public: ApplySpecialColormapRGBACommand(FSpecialColormap *colormap, DFrameBuffer *screen); void Execute(DrawerThread *thread) override; - FString DebugInfo() override { return "ApplySpecialColormapRGBACommand"; } }; #endif @@ -219,7 +212,6 @@ namespace swrenderer public: DrawParticleColumnRGBACommand(uint32_t *dest, int dest_y, int pitch, int count, uint32_t fg, uint32_t alpha, uint32_t fracposx); void Execute(DrawerThread *thread) override; - FString DebugInfo() override; private: uint32_t *_dest; @@ -238,7 +230,6 @@ namespace swrenderer public: DrawVoxelBlocksRGBACommand(const SpriteDrawerArgs &args, const VoxelBlock *blocks, int blockcount); void Execute(DrawerThread *thread) override; - FString DebugInfo() override; private: SpriteDrawerArgs args; diff --git a/src/swrenderer/drawers/r_draw_sky32.h b/src/swrenderer/drawers/r_draw_sky32.h index 97bddc15e..59c8826fa 100644 --- a/src/swrenderer/drawers/r_draw_sky32.h +++ b/src/swrenderer/drawers/r_draw_sky32.h @@ -158,8 +158,6 @@ namespace swrenderer index += num_cores; } } - - FString DebugInfo() override { return "DrawSkySingle32Command"; } }; class DrawSkyDouble32Command : public DrawerCommand @@ -313,7 +311,5 @@ namespace swrenderer index += num_cores; } } - - FString DebugInfo() override { return "DrawSkyDouble32Command"; } }; } diff --git a/src/swrenderer/drawers/r_draw_sky32_sse2.h b/src/swrenderer/drawers/r_draw_sky32_sse2.h index 997aac030..401d5bad1 100644 --- a/src/swrenderer/drawers/r_draw_sky32_sse2.h +++ b/src/swrenderer/drawers/r_draw_sky32_sse2.h @@ -153,8 +153,6 @@ namespace swrenderer index += num_cores; } } - - FString DebugInfo() override { return "DrawSkySingle32Command"; } }; class DrawSkyDouble32Command : public DrawerCommand @@ -308,7 +306,5 @@ namespace swrenderer index += num_cores; } } - - FString DebugInfo() override { return "DrawSkyDouble32Command"; } }; } diff --git a/src/swrenderer/drawers/r_draw_span32.h b/src/swrenderer/drawers/r_draw_span32.h index 290703793..f0b83c796 100644 --- a/src/swrenderer/drawers/r_draw_span32.h +++ b/src/swrenderer/drawers/r_draw_span32.h @@ -432,8 +432,6 @@ namespace swrenderer return outcolor; } } - - FString DebugInfo() override { return "DrawSpan32T"; } }; typedef DrawSpan32T DrawSpan32Command; diff --git a/src/swrenderer/drawers/r_draw_span32_sse2.h b/src/swrenderer/drawers/r_draw_span32_sse2.h index 7b0af6257..f5823a3eb 100644 --- a/src/swrenderer/drawers/r_draw_span32_sse2.h +++ b/src/swrenderer/drawers/r_draw_span32_sse2.h @@ -513,8 +513,6 @@ namespace swrenderer return outcolor; } } - - FString DebugInfo() override { return "DrawSpan32T"; } }; typedef DrawSpan32T DrawSpan32Command; diff --git a/src/swrenderer/drawers/r_draw_sprite32.h b/src/swrenderer/drawers/r_draw_sprite32.h index 7032b05d5..e40264689 100644 --- a/src/swrenderer/drawers/r_draw_sprite32.h +++ b/src/swrenderer/drawers/r_draw_sprite32.h @@ -386,8 +386,6 @@ namespace swrenderer return outcolor; } } - - FString DebugInfo() override { return "DrawSprite32T"; } }; typedef DrawSprite32T DrawSpriteCopy32Command; diff --git a/src/swrenderer/drawers/r_draw_sprite32_sse2.h b/src/swrenderer/drawers/r_draw_sprite32_sse2.h index 49b62d64d..d07dbc585 100644 --- a/src/swrenderer/drawers/r_draw_sprite32_sse2.h +++ b/src/swrenderer/drawers/r_draw_sprite32_sse2.h @@ -443,8 +443,6 @@ namespace swrenderer return outcolor; } } - - FString DebugInfo() override { return "DrawSprite32T"; } }; typedef DrawSprite32T DrawSpriteCopy32Command; diff --git a/src/swrenderer/drawers/r_draw_wall32.h b/src/swrenderer/drawers/r_draw_wall32.h index 64c6a8d44..864c1f9c6 100644 --- a/src/swrenderer/drawers/r_draw_wall32.h +++ b/src/swrenderer/drawers/r_draw_wall32.h @@ -331,8 +331,6 @@ namespace swrenderer return outcolor; } } - - FString DebugInfo() override { return "DrawWall32T"; } }; typedef DrawWall32T DrawWall32Command; diff --git a/src/swrenderer/drawers/r_draw_wall32_sse2.h b/src/swrenderer/drawers/r_draw_wall32_sse2.h index e0b0c0d77..02dfcf90f 100644 --- a/src/swrenderer/drawers/r_draw_wall32_sse2.h +++ b/src/swrenderer/drawers/r_draw_wall32_sse2.h @@ -406,8 +406,6 @@ namespace swrenderer return outcolor; } } - - FString DebugInfo() override { return "DrawWall32T"; } }; typedef DrawWall32T DrawWall32Command; diff --git a/src/swrenderer/drawers/r_thread.h b/src/swrenderer/drawers/r_thread.h index fe6b9a931..c09f62b4b 100644 --- a/src/swrenderer/drawers/r_thread.h +++ b/src/swrenderer/drawers/r_thread.h @@ -95,7 +95,6 @@ public: virtual ~DrawerCommand() { } virtual void Execute(DrawerThread *thread) = 0; - virtual FString DebugInfo() = 0; }; void VectoredTryCatch(void *data, void(*tryBlock)(void *data), void(*catchBlock)(void *data, const char *reason, bool fatal));