From 79c9b979d28dd263a75174b5b146af05fba5157e Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 11 Jan 2022 17:19:16 +0100 Subject: [PATCH] - backend update from Raze. --- src/common/2d/v_draw.h | 2 ++ src/common/engine/i_net.cpp | 2 +- src/common/rendering/gl/gl_framebuffer.cpp | 1 - src/common/rendering/gles/gles_framebuffer.cpp | 2 -- src/common/rendering/hwrenderer/data/hw_cvars.cpp | 2 +- src/common/rendering/hwrenderer/data/hw_dynlightdata.h | 2 +- src/common/rendering/v_video.cpp | 1 - src/common/rendering/vulkan/system/vk_framebuffer.cpp | 2 -- src/d_main.cpp | 1 + 9 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/common/2d/v_draw.h b/src/common/2d/v_draw.h index 0d25d59999..fecfc3d9ed 100644 --- a/src/common/2d/v_draw.h +++ b/src/common/2d/v_draw.h @@ -325,3 +325,5 @@ public: CleanHeight = savedheight; } }; + +void Draw2D(F2DDrawer* drawer, FRenderState& state); diff --git a/src/common/engine/i_net.cpp b/src/common/engine/i_net.cpp index cf5773b0c0..85a1219b0e 100644 --- a/src/common/engine/i_net.cpp +++ b/src/common/engine/i_net.cpp @@ -7,7 +7,7 @@ // // 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 +// the Free Software Foundation, either version 2 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, diff --git a/src/common/rendering/gl/gl_framebuffer.cpp b/src/common/rendering/gl/gl_framebuffer.cpp index 2ff99b5117..53a24bf066 100644 --- a/src/common/rendering/gl/gl_framebuffer.cpp +++ b/src/common/rendering/gl/gl_framebuffer.cpp @@ -69,7 +69,6 @@ EXTERN_CVAR(Int, gl_pipeline_depth); void gl_LoadExtensions(); void gl_PrintStartupLog(); -void Draw2D(F2DDrawer *drawer, FRenderState &state); extern bool vid_hdr_active; diff --git a/src/common/rendering/gles/gles_framebuffer.cpp b/src/common/rendering/gles/gles_framebuffer.cpp index f3806f1326..c858e969f9 100644 --- a/src/common/rendering/gles/gles_framebuffer.cpp +++ b/src/common/rendering/gles/gles_framebuffer.cpp @@ -67,8 +67,6 @@ EXTERN_CVAR(Int, gl_pipeline_depth); EXTERN_CVAR(Bool, gl_sort_textures); -void Draw2D(F2DDrawer *drawer, FRenderState &state); - extern bool vid_hdr_active; namespace OpenGLESRenderer diff --git a/src/common/rendering/hwrenderer/data/hw_cvars.cpp b/src/common/rendering/hwrenderer/data/hw_cvars.cpp index 5c1b64359f..14f5f2a87f 100644 --- a/src/common/rendering/hwrenderer/data/hw_cvars.cpp +++ b/src/common/rendering/hwrenderer/data/hw_cvars.cpp @@ -44,7 +44,7 @@ #include "printf.h" -CUSTOM_CVAR(Int, gl_fogmode, 1, CVAR_ARCHIVE | CVAR_NOINITCALL) +CUSTOM_CVAR(Int, gl_fogmode, 2, CVAR_ARCHIVE | CVAR_NOINITCALL) { if (self > 2) self = 2; if (self < 0) self = 0; diff --git a/src/common/rendering/hwrenderer/data/hw_dynlightdata.h b/src/common/rendering/hwrenderer/data/hw_dynlightdata.h index d54b7427ee..7da1c1b5af 100644 --- a/src/common/rendering/hwrenderer/data/hw_dynlightdata.h +++ b/src/common/rendering/hwrenderer/data/hw_dynlightdata.h @@ -6,7 +6,7 @@ // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU Lesser General Public License as published by -// the Free Software Foundation, either version 3 of the License, or +// the Free Software Foundation, either version 2 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, diff --git a/src/common/rendering/v_video.cpp b/src/common/rendering/v_video.cpp index 9476bf6abd..277144aa86 100644 --- a/src/common/rendering/v_video.cpp +++ b/src/common/rendering/v_video.cpp @@ -121,7 +121,6 @@ CUSTOM_CVAR(Int, vid_preferbackend, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_N Printf("Changing the video backend requires a restart for " GAMENAME ".\n"); } -CVAR(Int, vid_renderer, 1, 0) // for some stupid mods which threw caution out of the window... CUSTOM_CVAR(Int, uiscale, 0, CVAR_ARCHIVE | CVAR_NOINITCALL) { diff --git a/src/common/rendering/vulkan/system/vk_framebuffer.cpp b/src/common/rendering/vulkan/system/vk_framebuffer.cpp index 76444dfb9e..ee64909b48 100644 --- a/src/common/rendering/vulkan/system/vk_framebuffer.cpp +++ b/src/common/rendering/vulkan/system/vk_framebuffer.cpp @@ -57,8 +57,6 @@ #include "engineerrors.h" #include "c_dispatch.h" -void Draw2D(F2DDrawer *drawer, FRenderState &state); - EXTERN_CVAR(Bool, r_drawvoxels) EXTERN_CVAR(Int, gl_tonemap) EXTERN_CVAR(Int, screenblocks) diff --git a/src/d_main.cpp b/src/d_main.cpp index efa8ca8783..4f0c26465b 100644 --- a/src/d_main.cpp +++ b/src/d_main.cpp @@ -128,6 +128,7 @@ EXTERN_CVAR(Int, vr_mode) EXTERN_CVAR(Bool, cl_customizeinvulmap) EXTERN_CVAR(Bool, log_vgafont) EXTERN_CVAR(Bool, dlg_vgafont) +CVAR(Int, vid_renderer, 1, 0) // for some stupid mods which threw caution out of the window... void DrawHUD(); void D_DoAnonStats();