From ca93d7456ab9187c7e4b175195e691674159d966 Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Wed, 1 Feb 2017 21:59:48 +0100 Subject: [PATCH] Change redundant bRenderingToCanvas into a helper function --- src/polyrenderer/poly_renderer.cpp | 2 -- src/swrenderer/scene/r_opaque_pass.cpp | 2 +- src/swrenderer/scene/r_scene.cpp | 2 -- src/swrenderer/scene/r_viewport.cpp | 2 +- src/swrenderer/scene/r_viewport.h | 3 ++- 5 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/polyrenderer/poly_renderer.cpp b/src/polyrenderer/poly_renderer.cpp index 0b3c060f14..f8bcedc7c1 100644 --- a/src/polyrenderer/poly_renderer.cpp +++ b/src/polyrenderer/poly_renderer.cpp @@ -85,7 +85,6 @@ void PolyRenderer::RenderViewToCanvas(AActor *actor, DCanvas *canvas, int x, int viewwidth = width; viewport->RenderTarget = canvas; - viewport->bRenderingToCanvas = true; R_SetWindow(12, width, height, height, true); viewport->SetViewport(width, height, WidescreenRatio); viewwindowx = x; @@ -99,7 +98,6 @@ void PolyRenderer::RenderViewToCanvas(AActor *actor, DCanvas *canvas, int x, int canvas->Unlock(); viewport->RenderTarget = screen; - viewport->bRenderingToCanvas = false; R_ExecuteSetViewSize(); float trueratio; ActiveRatio(width, height, &trueratio); diff --git a/src/swrenderer/scene/r_opaque_pass.cpp b/src/swrenderer/scene/r_opaque_pass.cpp index a1c5caafcc..46facc5e53 100644 --- a/src/swrenderer/scene/r_opaque_pass.cpp +++ b/src/swrenderer/scene/r_opaque_pass.cpp @@ -815,7 +815,7 @@ namespace swrenderer auto viewport = RenderViewport::Instance(); // clip ceiling to console bottom fillshort(floorclip, viewwidth, viewheight); - fillshort(ceilingclip, viewwidth, !screen->Accel2D && ConBottom > viewwindowy && !viewport->bRenderingToCanvas ? (ConBottom - viewwindowy) : 0); + fillshort(ceilingclip, viewwidth, !screen->Accel2D && ConBottom > viewwindowy && !viewport->RenderingToCanvas() ? (ConBottom - viewwindowy) : 0); } void RenderOpaquePass::AddSprites(sector_t *sec, int lightlevel, WaterFakeSide fakeside, bool foggy, FDynamicColormap *basecolormap) diff --git a/src/swrenderer/scene/r_scene.cpp b/src/swrenderer/scene/r_scene.cpp index df44d9f16a..84bcaee2bb 100644 --- a/src/swrenderer/scene/r_scene.cpp +++ b/src/swrenderer/scene/r_scene.cpp @@ -199,7 +199,6 @@ namespace swrenderer viewwidth = width; viewport->RenderTarget = canvas; - viewport->bRenderingToCanvas = true; R_SetWindow(12, width, height, height, true); viewwindowx = x; @@ -212,7 +211,6 @@ namespace swrenderer R_EndDrawerCommands(); viewport->RenderTarget = screen; - viewport->bRenderingToCanvas = false; R_ExecuteSetViewSize(); float trueratio; diff --git a/src/swrenderer/scene/r_viewport.cpp b/src/swrenderer/scene/r_viewport.cpp index 0c0e0e931b..89f758ad94 100644 --- a/src/swrenderer/scene/r_viewport.cpp +++ b/src/swrenderer/scene/r_viewport.cpp @@ -48,7 +48,7 @@ namespace swrenderer { int virtheight, virtwidth, virtwidth2, virtheight2; - if (!bRenderingToCanvas) + if (!RenderingToCanvas()) { // Set r_viewsize cvar to reflect the current view size UCVarValue value; char temp[16]; diff --git a/src/swrenderer/scene/r_viewport.h b/src/swrenderer/scene/r_viewport.h index 0fc90bc514..e2daba8bb2 100644 --- a/src/swrenderer/scene/r_viewport.h +++ b/src/swrenderer/scene/r_viewport.h @@ -27,7 +27,6 @@ namespace swrenderer void SetupFreelook(); DCanvas *RenderTarget = nullptr; - bool bRenderingToCanvas = false; fixed_t viewingrangerecip = 0; double FocalLengthX = 0.0; double FocalLengthY = 0.0; @@ -47,6 +46,8 @@ namespace swrenderer uint8_t *dc_destorg = nullptr; + bool RenderingToCanvas() const { return RenderTarget != screen; } + private: void InitTextureMapping(); void SetupBuffer();