Merge branch 'master' into sync-changes

This commit is contained in:
SRSaunders 2023-03-05 09:44:21 -05:00 committed by GitHub
commit 23c3b66c8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 46 additions and 7 deletions

View file

@ -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.

View file

@ -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"

View file

@ -107,9 +107,7 @@ const int MAX_EXPRESSION_REGISTERS = 4096;
#endif
// RB: make Optick profiling available everywhere
#if USE_OPTICK
#include "../libs/optick/optick.h"
#endif
#include "../libs/optick/optick.h"
#include "../renderer/Cinematic.h"
#include "../renderer/Material.h"

View file

@ -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
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

View file

@ -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