diff --git a/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp b/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp
index f1582e0a19..0a0186f1b0 100644
--- a/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp
+++ b/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp
@@ -242,7 +242,7 @@ private:
             if (SDL_LockTexture(_screenTexture, nullptr, &pixels, &pitch) == 0)
             {
                 LightFx::RenderToTexture(
-                    viewport, pixels, pitch, _bits, _width, _height, _paletteHWMapped, _lightPaletteHWMapped);
+                    *viewport, pixels, pitch, _bits, _width, _height, _paletteHWMapped, _lightPaletteHWMapped);
                 SDL_UnlockTexture(_screenTexture);
             }
         }
diff --git a/src/openrct2/drawing/LightFX.cpp b/src/openrct2/drawing/LightFX.cpp
index 6d751dd465..38098b67bd 100644
--- a/src/openrct2/drawing/LightFX.cpp
+++ b/src/openrct2/drawing/LightFX.cpp
@@ -87,6 +87,16 @@ namespace OpenRCT2::Drawing::LightFx
 
     static GamePalette gPalette_light;
 
+    constexpr uint8_t GetLightTypeSize(LightType type)
+    {
+        return static_cast<uint8_t>(type) & 0x3;
+    }
+
+    constexpr LightType SetLightTypeSize(LightType type, uint8_t size)
+    {
+        return static_cast<LightType>((static_cast<uint8_t>(type) & ~0x3) | size);
+    }
+
     static uint8_t CalcLightIntensityLantern(int32_t x, int32_t y)
     {
         double distance = static_cast<double>(x * x + y * y);
@@ -189,7 +199,7 @@ namespace OpenRCT2::Drawing::LightFx
         _pixelInfo = info;
     }
 
-    void PrepareLightList(const Viewport* vp)
+    static void PrepareLightList(const Viewport& vp)
     {
         for (uint32_t light = 0; light < LightListCurrentCountFront; light++)
         {
@@ -294,7 +304,8 @@ namespace OpenRCT2::Drawing::LightFx
 
                     ViewportInteractionItem interactionType = ViewportInteractionItem::None;
 
-                    if ((vp->flags & VIEWPORT_FLAG_RENDERING_INHIBITED) == 0)
+                    // NOTE: When the flag VIEWPORT_FLAG_RENDERING_INHIBITED is set we can not create a paint graph.
+                    if ((vp.flags & VIEWPORT_FLAG_RENDERING_INHIBITED) == 0)
                     {
                         // based on GetMapCoordinatesFromPosWindow
                         RenderTarget rt;
@@ -309,10 +320,10 @@ namespace OpenRCT2::Drawing::LightFx
                         rt.cullingWidth = rt.width;
                         rt.cullingHeight = rt.height;
 
-                        PaintSession* session = PaintSessionAlloc(rt, vp->flags, vp->rotation);
+                        PaintSession* session = PaintSessionAlloc(rt, vp.flags, vp.rotation);
                         PaintSessionGenerate(*session);
                         PaintSessionArrange(*session);
-                        auto info = SetInteractionInfoFromPaintSession(session, vp->flags, kViewportInteractionItemAll);
+                        auto info = SetInteractionInfoFromPaintSession(session, vp.flags, kViewportInteractionItemAll);
                         PaintSessionFree(session);
 
                         mapCoord = info.Loc;
@@ -402,7 +413,7 @@ namespace OpenRCT2::Drawing::LightFx
         }
     }
 
-    void SwapBuffers()
+    static void SwapBuffers()
     {
         void* tmp = _light_rendered_buffer_back;
         _light_rendered_buffer_back = _light_rendered_buffer_front;
@@ -430,15 +441,15 @@ namespace OpenRCT2::Drawing::LightFx
         _current_view_zoom_back_delay = _current_view_zoom_back;
     }
 
-    void UpdateViewportSettings(const Viewport* vp)
+    static void UpdateViewportSettings(const Viewport& vp)
     {
-        _current_view_x_back = vp->viewPos.x;
-        _current_view_y_back = vp->viewPos.y;
-        _current_view_rotation_back = vp->rotation;
-        _current_view_zoom_back = vp->zoom;
+        _current_view_x_back = vp.viewPos.x;
+        _current_view_y_back = vp.viewPos.y;
+        _current_view_rotation_back = vp.rotation;
+        _current_view_zoom_back = vp.zoom;
     }
 
-    void RenderLightsToFrontBuffer()
+    static void RenderLightsToFrontBuffer()
     {
         if (_light_rendered_buffer_front == nullptr)
         {
@@ -610,7 +621,7 @@ namespace OpenRCT2::Drawing::LightFx
         }
     }
 
-    void* GetFrontBuffer()
+    static void* GetFrontBuffer()
     {
         return _light_rendered_buffer_front;
     }
@@ -685,7 +696,7 @@ namespace OpenRCT2::Drawing::LightFx
         Add3DLight({ x, y, offsetZ }, lightType);
     }
 
-    uint32_t GetLightPolution()
+    static uint32_t GetLightPolution()
     {
         return _lightPolution_front;
     }
@@ -1015,7 +1026,7 @@ namespace OpenRCT2::Drawing::LightFx
     }
 
     void RenderToTexture(
-        const Viewport* vp, void* dstPixels, uint32_t dstPitch, uint8_t* bits, uint32_t width, uint32_t height,
+        const Viewport& vp, void* dstPixels, uint32_t dstPitch, uint8_t* bits, uint32_t width, uint32_t height,
         const uint32_t* palette, const uint32_t* lightPalette)
     {
         UpdateViewportSettings(vp);
diff --git a/src/openrct2/drawing/LightFX.h b/src/openrct2/drawing/LightFX.h
index 0c764a5deb..8ce68a7bd1 100644
--- a/src/openrct2/drawing/LightFX.h
+++ b/src/openrct2/drawing/LightFX.h
@@ -41,15 +41,6 @@ namespace OpenRCT2::Drawing::LightFx
         Spot3 = 11,
     };
 
-    constexpr uint8_t GetLightTypeSize(LightType type)
-    {
-        return static_cast<uint8_t>(type) & 0x3;
-    }
-    constexpr LightType SetLightTypeSize(LightType type, uint8_t size)
-    {
-        return static_cast<LightType>((static_cast<uint8_t>(type) & ~0x3) | size);
-    }
-
     void SetAvailable(bool available);
     bool IsAvailable();
     bool ForVehiclesIsAvailable();
@@ -57,13 +48,6 @@ namespace OpenRCT2::Drawing::LightFx
     void Init();
 
     void UpdateBuffers(RenderTarget&);
-
-    void PrepareLightList();
-    void SwapBuffers();
-    void RenderLightsToFrontBuffer();
-    void UpdateViewportSettings();
-
-    void* GetFrontBuffer();
     const GamePalette& GetPalette();
 
     void Add3DLight(const EntityBase& entity, const uint8_t id, const CoordsXYZ& loc, const LightType lightType);
@@ -82,11 +66,9 @@ namespace OpenRCT2::Drawing::LightFx
     void AddKioskLights(const CoordsXY& mapPosition, const int32_t height, const uint8_t zOffset);
     void AddShopLights(const CoordsXY& mapPosition, const uint8_t direction, const int32_t height, const uint8_t zOffset);
 
-    uint32_t GetLightPolution();
-
     void ApplyPaletteFilter(uint8_t i, uint8_t* r, uint8_t* g, uint8_t* b);
     void RenderToTexture(
-        const Viewport* vp, void* dstPixels, uint32_t dstPitch, uint8_t* bits, uint32_t width, uint32_t height,
+        const Viewport& vp, void* dstPixels, uint32_t dstPitch, uint8_t* bits, uint32_t width, uint32_t height,
         const uint32_t* palette, const uint32_t* lightPalette);
 
 } // namespace OpenRCT2::Drawing::LightFx