id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-04-24 02:32:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added menu option to choose between DX12 and Vulkan

Browse source
This commit is contained in:
Robert Beckebans 2023-02-23 20:22:03 +01:00
parent f1e9d79fb7
commit 91abc9dffd
3 changed files with 83 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
neo/d3xp/menus/MenuScreen.h
View file

@ -1360,13 +1360,15 @@ public:
public:
enum systemSettingFields_t
{
#ifdef _WIN32
SYSTEM_FIELD_RENDERAPI, // RB: choose between DX12 and Vulkan on Windows
#endif
SYSTEM_FIELD_FULLSCREEN,
SYSTEM_FIELD_FRAMERATE,
SYSTEM_FIELD_VSYNC,
SYSTEM_FIELD_ANTIALIASING,
// RB begin
SYSTEM_FIELD_POSTFX,
SYSTEM_FIELD_SHADOWMAPPING,
SYSTEM_FIELD_SSAO,
SYSTEM_FIELD_AMBIENT_BRIGHTNESS,
// RB end
@ -1395,6 +1397,7 @@ public:
bool IsRestartRequired() const;
private:
idStr originalRenderAPI;
int originalFramerate;
int originalAntialias;
int originalVsync;

89
neo/d3xp/menus/MenuScreen_Shell_SystemOptions.cpp
View file

@ -3,7 +3,7 @@
Doom 3 BFG Edition GPL Source Code
Copyright (C) 1993-2012 id Software LLC, a ZeniMax Media company.
Copyright (C) 2014-2016 Robert Beckebans
Copyright (C) 2014-2023 Robert Beckebans
This file is part of the Doom 3 BFG Edition GPL Source Code ("Doom 3 BFG Edition Source Code").
@ -32,6 +32,7 @@ If you have questions concerning this license or the applicable additional terms
const static int NUM_SYSTEM_OPTIONS_OPTIONS = 8;
extern idCVar r_graphicsAPI;
extern idCVar r_antiAliasing;
extern idCVar r_useFilmicPostProcessing;
extern idCVar r_swapInterval;
@ -72,6 +73,17 @@ void idMenuScreen_Shell_SystemOptions::Initialize( idMenuHandler* data )
AddChild( btnBack );
idMenuWidget_ControlButton* control;
#ifdef _WIN32
control = new( TAG_SWF ) idMenuWidget_ControlButton();
control->SetOptionType( OPTION_SLIDER_TEXT );
control->SetLabel( "Render API" );
control->SetDataSource( &systemData, idMenuDataSource_SystemSettings::SYSTEM_FIELD_RENDERAPI );
control->SetupEvents( DEFAULT_REPEAT_TIME, options->GetChildren().Num() );
control->AddEventAction( WIDGET_EVENT_PRESS ).Set( WIDGET_ACTION_COMMAND, idMenuDataSource_SystemSettings::SYSTEM_FIELD_RENDERAPI );
options->AddChild( control );
#endif
control = new( TAG_SWF ) idMenuWidget_ControlButton();
control->SetOptionType( OPTION_SLIDER_TEXT );
control->SetLabel( "#str_02154" );
@ -113,14 +125,6 @@ void idMenuScreen_Shell_SystemOptions::Initialize( idMenuHandler* data )
control->AddEventAction( WIDGET_EVENT_PRESS ).Set( WIDGET_ACTION_COMMAND, idMenuDataSource_SystemSettings::SYSTEM_FIELD_POSTFX );
options->AddChild( control );
control = new( TAG_SWF ) idMenuWidget_ControlButton();
control->SetOptionType( OPTION_SLIDER_TEXT );
control->SetLabel( "Soft Shadows" );
control->SetDataSource( &systemData, idMenuDataSource_SystemSettings::SYSTEM_FIELD_SHADOWMAPPING );
control->SetupEvents( DEFAULT_REPEAT_TIME, options->GetChildren().Num() );
control->AddEventAction( WIDGET_EVENT_PRESS ).Set( WIDGET_ACTION_COMMAND, idMenuDataSource_SystemSettings::SYSTEM_FIELD_SHADOWMAPPING );
options->AddChild( control );
control = new( TAG_SWF ) idMenuWidget_ControlButton();
control->SetOptionType( OPTION_SLIDER_TEXT );
control->SetLabel( "SSAO" );
@ -407,6 +411,7 @@ idMenuScreen_Shell_SystemOptions::idMenuDataSource_SystemSettings::LoadData
*/
void idMenuScreen_Shell_SystemOptions::idMenuDataSource_SystemSettings::LoadData()
{
originalRenderAPI = r_graphicsAPI.GetString();
originalFramerate = com_engineHz.GetInteger();
originalAntialias = r_antiAliasing.GetInteger();
originalVsync = r_swapInterval.GetInteger();
@ -437,17 +442,25 @@ idMenuScreen_Shell_SystemOptions::idMenuDataSource_SystemSettings::IsRestartRequ
*/
bool idMenuScreen_Shell_SystemOptions::idMenuDataSource_SystemSettings::IsRestartRequired() const
{
/*
if( originalAntialias != r_antiAliasing.GetInteger() )
{
return true;
}
if( originalFramerate != com_engineHz.GetInteger() )
if( originalShadowMapping != r_useShadowMapping.GetInteger() )
{
return true;
}
if( originalShadowMapping != r_useShadowMapping.GetInteger() )
*/
if( idStr::Icmp( r_graphicsAPI.GetString(), originalRenderAPI ) != 0 )
{
return true;
}
if( originalFramerate != com_engineHz.GetInteger() )
{
return true;
}
@ -511,6 +524,36 @@ void idMenuScreen_Shell_SystemOptions::idMenuDataSource_SystemSettings::AdjustFi
{
switch( fieldIndex )
{
#ifdef _WIN32
case SYSTEM_FIELD_RENDERAPI:
{
static const int numValues = 2;
static const int values[numValues] = { 0, 1 };
int option = 0;
if( !idStr::Icmp( r_graphicsAPI.GetString(), "vulkan" ) )
{
option = 1;
}
else
{
option = 0;
}
option = AdjustOption( option, values, numValues, adjustAmount );
if( option == 1 )
{
r_graphicsAPI.SetString( "vulkan" );
}
else
{
r_graphicsAPI.SetString( "dx12" );
}
break;
}
#endif
case SYSTEM_FIELD_FRAMERATE:
{
static const int numValues = 2;
@ -557,6 +600,7 @@ void idMenuScreen_Shell_SystemOptions::idMenuDataSource_SystemSettings::AdjustFi
r_useFilmicPostProcessing.SetInteger( AdjustOption( r_useFilmicPostProcessing.GetInteger(), values, numValues, adjustAmount ) );
break;
}
/*
case SYSTEM_FIELD_SHADOWMAPPING:
{
static const int numValues = 2;
@ -564,7 +608,7 @@ void idMenuScreen_Shell_SystemOptions::idMenuDataSource_SystemSettings::AdjustFi
r_useShadowMapping.SetInteger( AdjustOption( r_useShadowMapping.GetInteger(), values, numValues, adjustAmount ) );
break;
}
/*case SYSTEM_FIELD_LODBIAS:
case SYSTEM_FIELD_LODBIAS:
{
const float percent = LinearAdjust( r_lodBias.GetFloat(), -1.0f, 1.0f, 0.0f, 100.0f );
const float adjusted = percent + ( float )adjustAmount * 5.0f;
@ -620,6 +664,20 @@ idSWFScriptVar idMenuScreen_Shell_SystemOptions::idMenuDataSource_SystemSettings
{
switch( fieldIndex )
{
#ifdef _WIN32
case SYSTEM_FIELD_RENDERAPI:
{
if( !idStr::Icmp( r_graphicsAPI.GetString(), "vulkan" ) )
{
return "Vulkan";
}
else
{
return "DirectX 12";
}
}
#endif
case SYSTEM_FIELD_FULLSCREEN:
{
const int fullscreen = r_fullscreen.GetInteger();
@ -703,6 +761,7 @@ idSWFScriptVar idMenuScreen_Shell_SystemOptions::idMenuDataSource_SystemSettings
//return va( "%dx", idMath::IPow( 2, r_motionBlur.GetInteger() ) );
// RB begin
/*
case SYSTEM_FIELD_SHADOWMAPPING:
if( r_useShadowMapping.GetInteger() == 1 )
{
@ -712,6 +771,7 @@ idSWFScriptVar idMenuScreen_Shell_SystemOptions::idMenuDataSource_SystemSettings
{
return "#str_swf_disabled";
}
*/
//case SYSTEM_FIELD_LODBIAS:
// return LinearAdjust( r_lodBias.GetFloat(), -1.0f, 1.0f, 0.0f, 100.0f );
@ -748,6 +808,11 @@ idMenuScreen_Shell_SystemOptions::idMenuDataSource_SystemSettings::IsDataChanged
*/
bool idMenuScreen_Shell_SystemOptions::idMenuDataSource_SystemSettings::IsDataChanged() const
{
if( idStr::Icmp( r_graphicsAPI.GetString(), originalRenderAPI ) != 0 )
{
return true;
}
if( originalFramerate != com_engineHz.GetInteger() )
{
return true;

4
neo/renderer/RenderSystem_init.cpp
View file

@ -265,8 +265,8 @@ idCVar stereoRender_deGhost( "stereoRender_deGhost", "0.05", CVAR_FLOAT | CVAR_A
idCVar r_useVirtualScreenResolution( "r_useVirtualScreenResolution", "0", CVAR_RENDERER | CVAR_BOOL | CVAR_ARCHIVE, "do 2D rendering at 640x480 and stretch to the current resolution" );
// RB: shadow mapping parameters
#if defined( USE_VULKAN )
idCVar r_useShadowMapping( "r_useShadowMapping", "0", CVAR_RENDERER | CVAR_ROM | CVAR_STATIC | CVAR_INTEGER, "use shadow mapping instead of stencil shadows" );
#if 1 //defined( USE_VULKAN )
idCVar r_useShadowMapping( "r_useShadowMapping", "1", CVAR_RENDERER | CVAR_ROM | CVAR_STATIC | CVAR_INTEGER, "use shadow mapping instead of stencil shadows" );
#else
idCVar r_useShadowMapping( "r_useShadowMapping", "1", CVAR_RENDERER | CVAR_ARCHIVE | CVAR_INTEGER, "use shadow mapping instead of stencil shadows" );
#endif