id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-03-14 22:50:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Renamed r_gapi to r_graphicsAPI

Browse source
This commit is contained in:
Robert Beckebans 2022-09-17 08:01:22 +02:00
parent 322245d9f1
commit 4dbb4bd114
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
neo/renderer/RenderCommon.h
View file

@ -1109,7 +1109,6 @@ extern idCVar r_windowWidth;
extern idCVar r_windowHeight;
extern idCVar r_debugContext; // enable various levels of context debug
extern idCVar r_glDriver; // "opengl32", etc
#if defined(USE_NVRHI)
extern idCVar r_useValidationLayers;
#endif

14
neo/renderer/RenderSystem_init.cpp
View file

@ -65,9 +65,13 @@ glconfig_t glConfig;
idCVar r_requestStereoPixelFormat( "r_requestStereoPixelFormat", "1", CVAR_RENDERER, "Ask for a stereo GL pixel format on startup" );
idCVar r_debugContext( "r_debugContext", "0", CVAR_RENDERER, "Enable various levels of context debug." );
idCVar r_glDriver( "r_glDriver", "", CVAR_RENDERER, "\"opengl32\", etc." );
#if defined(USE_NVRHI)
idCVar r_gapi( "r_gapi", "dx12", CVAR_RENDERER, "Specifies the graphics api to use (dx12, vulkan)" );
#if defined( USE_NVRHI )
#if defined( _WIN32 )
idCVar r_graphicsAPI( "r_graphicsAPI", "vulkan", CVAR_RENDERER, "Specifies the graphics api to use (dx12, vulkan)" );
#else
idCVar r_graphicsAPI( "r_graphicsAPI", "vulkan", CVAR_RENDERER, "Specifies the graphics api to use (vulkan)" );
#endif
idCVar r_useValidationLayers( "r_useValidationLayers", "1", CVAR_INTEGER | CVAR_INIT, "1 is just the NVRHI and 2 will turn on additional DX12, VK validation layers" );
#endif
// SRS - Added workaround for AMD OSX driver bugs caused by GL_EXT_timer_query when shadow mapping enabled; Intel bugs not present on OSX
@ -513,11 +517,11 @@ void R_SetNewMode( const bool fullInit )
#if defined( USE_NVRHI )
nvrhi::GraphicsAPI api = nvrhi::GraphicsAPI::D3D12;
if( !idStr::Icmp( r_gapi.GetString(), "vulkan" ) )
if( !idStr::Icmp( r_graphicsAPI.GetString(), "vulkan" ) )
{
api = nvrhi::GraphicsAPI::VULKAN;
}
else if( !idStr::Icmp( r_gapi.GetString(), "dx12" ) )
else if( !idStr::Icmp( r_graphicsAPI.GetString(), "dx12" ) )
{
api = nvrhi::GraphicsAPI::D3D12;
}