From 784c46ebc79a52917637d16e2d66d00f3fcdcf6f Mon Sep 17 00:00:00 2001 From: Robert Beckebans Date: Sun, 5 Mar 2023 11:03:54 +0100 Subject: [PATCH 1/4] Fixed Optick related compile warnings on Linux #750 --- neo/idlib/precompiled.h | 4 +--- neo/libs/optick/optick.config.h | 7 ++++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/neo/idlib/precompiled.h b/neo/idlib/precompiled.h index 90dfe8d3..91bd2fa3 100644 --- a/neo/idlib/precompiled.h +++ b/neo/idlib/precompiled.h @@ -106,9 +106,7 @@ const int MAX_EXPRESSION_REGISTERS = 4096; #endif // RB: make Optick profiling available everywhere -#if defined( USE_OPTICK ) - #include "../libs/optick/optick.h" -#endif +#include "../libs/optick/optick.h" #include "../renderer/Cinematic.h" #include "../renderer/Material.h" diff --git a/neo/libs/optick/optick.config.h b/neo/libs/optick/optick.config.h index 0270bf94..b2d48edc 100644 --- a/neo/libs/optick/optick.config.h +++ b/neo/libs/optick/optick.config.h @@ -33,9 +33,10 @@ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // MASTER SWITCH - use it for disabling profiler in final builds // //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#if !defined(USE_OPTICK) -#define USE_OPTICK (1) -#endif +// RB: only set this through CMakeLists.txt +//#if !defined(USE_OPTICK) +//#define USE_OPTICK (1) +//#endif //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// From 52398a88cdfce1f3aa2e8d94556673465671229a Mon Sep 17 00:00:00 2001 From: Robert Beckebans Date: Sun, 5 Mar 2023 10:39:59 +0100 Subject: [PATCH 2/4] Changed ENGINE_BRANCH to master --- neo/framework/Licensee.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neo/framework/Licensee.h b/neo/framework/Licensee.h index 7c5c748a..deba52fb 100644 --- a/neo/framework/Licensee.h +++ b/neo/framework/Licensee.h @@ -44,7 +44,7 @@ If you have questions concerning this license or the applicable additional terms // RB end // jmarshall -#define ENGINE_BRANCH "NVRHI" +#define ENGINE_BRANCH "master" // jmarshall end #define BASE_GAMEDIR "base" From d7fbb283bd53aa2e7919345911c84e5d4468bce4 Mon Sep 17 00:00:00 2001 From: Robert Beckebans Date: Sun, 5 Mar 2023 10:50:13 +0100 Subject: [PATCH 3/4] Updated release notes --- RELEASE-NOTES.md | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index d35f560f..76c56696 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -18,6 +18,45 @@ _______________________________________ TBD - RBDOOM-3-BFG 1.5.0 _______________________________ +## .plan - March 05, 2023 + +This build improves the performance again and it shows the selected GPU with com_showFPS > 1. +This is probably the fastest version ever at least with DX12. + +Changelog: + +* Fixed Optick related compile warnings on Linux #750 + +* Removed obsolete cvar r_useHDR + +* Removed obsolete cvar r_useSeamlessCubeMap + +* Went back to 15 bits for VERTCACHE_FRAME_MASK to avoid weird model distortions in a single frame every 68 seconds + +* Fixed missing shadows in the kitchen of Mars City 1 + +* Added PROFILE_EVENT to RunFrame() + +* Fixed the CMake option -DOPTICK=ON/OFF + +* Display all the common different threads in Optick + +* Fixed crash of RBDoom after stopping an Optick capture + +* Super basic Optick profiler integration + +* Added r_graphicsAdapter to select a specific GPU + +* Tweaked DrawFPS maxTime to reduce flickering if V-Sync is on + +* Show picked GPU with com_showFPS > 1 + +* Small performance fix + +* Added additional FGDs + + + ## .plan - Feb 24, 2023 This build improves the image quality and performance. The SSAO implementation has been updated with the latest code from Nvidia's Donut samples which outperforms the old implementation and also adds better stability on different view angles. From 4efbbe531c0641da5d092462e471fb8f63f1bea9 Mon Sep 17 00:00:00 2001 From: Robert Beckebans Date: Sun, 5 Mar 2023 11:03:58 +0100 Subject: [PATCH 4/4] Include die maps/game/*_extra_ents.map patch files even for the Lite builds --- zip-RBDOOM-3-BFG-lite-snapshot.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/zip-RBDOOM-3-BFG-lite-snapshot.bat b/zip-RBDOOM-3-BFG-lite-snapshot.bat index 65b010a2..c96e8275 100644 --- a/zip-RBDOOM-3-BFG-lite-snapshot.bat +++ b/zip-RBDOOM-3-BFG-lite-snapshot.bat @@ -1,6 +1,7 @@ REM 7z a RBDOOM-3-BFG-1.3.1.1-lite-win64-20220109-git-xxxxxxx.7z -r base/env/ base/maps/*.lightgrid base/maps/*_extra_ents.map -x!generated set filename=RBDOOM-3-BFG-1.5.0.x-lite-win64-yyyymmdd-git-xxxxxxx.7z 7z a %filename% README.md RELEASE-NOTES.md base/devtools.cfg base/modelviewer.cfg base/extract_resources.cfg base/convert_maps_to_valve220.cfg base/def/*.def base/materials/*.mtr base/textures/common base/textures/editor base/maps/zoomaps -x!generated -xr!autosave -xr!*.xcf -xr!*.blend +7z a %filename% base/maps/game/*_extra_ents.map 7z a %filename% -r base/renderprogs2/dxil/*.bin 7z a %filename% -r base/renderprogs2/spirv/*.bin 7z a %filename% base/_tb/fgd/*.fgd