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

Merge branch 'master' into 841-makeMaterials-command

Browse source
This commit is contained in:
Robert Beckebans 2024-05-21 21:31:27 +02:00
commit 112b4a6829
5 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
neo/shaders/colorProcess.ps.hlsl
View file

@ -32,7 +32,7 @@ If you have questions concerning this license or the applicable additional terms
// *INDENT-OFF*
Texture2D t_CurrentRender : register( t0 VK_DESCRIPTOR_SET( 0 ) );
SamplerState LinearSampler : register( s0 VK_DESCRIPTOR_SET( 2 ) );
SamplerState LinearSampler : register( s0 VK_DESCRIPTOR_SET( 1 ) );
struct PS_IN
{

2
neo/shaders/colorProcess.vs.hlsl
View file

@ -59,7 +59,7 @@ void main( VS_IN vertex, out VS_OUT result )
result.color = rpUser1; // targetHue
result.texcoord0.x = vertex.texcoord.x;
result.texcoord0.y = 1.0f - vertex.texcoord.y;
result.texcoord0.y = /*1.0f -*/ vertex.texcoord.y;
result.texcoord0.z = rpUser0.x; // fraction
}

3
neo/sys/DeviceManager_DX12.cpp
View file

@ -382,7 +382,10 @@ bool DeviceManager_DX12::CreateDeviceAndSwapChain()
D3D12_MESSAGE_ID disableMessageIDs[] =
{
D3D12_MESSAGE_ID_CLEARDEPTHSTENCILVIEW_MISMATCHINGCLEARVALUE,
D3D12_MESSAGE_ID_CLEARRENDERTARGETVIEW_MISMATCHINGCLEARVALUE,
D3D12_MESSAGE_ID_COMMAND_LIST_STATIC_DESCRIPTOR_RESOURCE_DIMENSION_MISMATCH, // descriptor validation doesn't understand acceleration structures
D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_RENDERTARGETVIEW_NOT_SET, // disable warning when there is no color attachment (e.g. shadow atlas)
D3D12_MESSAGE_ID_RESOURCE_BARRIER_BEFORE_AFTER_MISMATCH // barrier validation error caused by cinematics - not sure how to fix, suppress for now
};
D3D12_INFO_QUEUE_FILTER filter = {};

19
neo/sys/DeviceManager_VK.cpp
View file

@ -253,7 +253,7 @@ private:
#endif
#endif
VK_EXT_SAMPLER_FILTER_MINMAX_EXTENSION_NAME,
VK_EXT_DEBUG_UTILS_EXTENSION_NAME
VK_EXT_DEBUG_REPORT_EXTENSION_NAME
},
// layers
{ },
@ -948,8 +948,6 @@ bool DeviceManager_VK::createDevice()
auto accelStructFeatures = vk::PhysicalDeviceAccelerationStructureFeaturesKHR()
.setAccelerationStructure( true );
auto bufferAddressFeatures = vk::PhysicalDeviceBufferAddressFeaturesEXT()
.setBufferDeviceAddress( true );
auto rayPipelineFeatures = vk::PhysicalDeviceRayTracingPipelineFeaturesKHR()
.setRayTracingPipeline( true )
.setRayTraversalPrimitiveCulling( true );
@ -986,7 +984,6 @@ bool DeviceManager_VK::createDevice()
#endif
#define APPEND_EXTENSION(condition, desc) if (condition) { (desc).pNext = pNext; pNext = &(desc); } // NOLINT(cppcoreguidelines-macro-usage)
APPEND_EXTENSION( accelStructSupported, accelStructFeatures )
APPEND_EXTENSION( bufferAddressSupported, bufferAddressFeatures )
APPEND_EXTENSION( rayPipelineSupported, rayPipelineFeatures )
APPEND_EXTENSION( rayQuerySupported, rayQueryFeatures )
APPEND_EXTENSION( meshletsSupported, meshletFeatures )
@ -1246,7 +1243,6 @@ bool DeviceManager_VK::CreateDeviceAndSwapChain()
if( m_DeviceParams.enableDebugRuntime )
{
enabledExtensions.instance.insert( VK_EXT_DEBUG_REPORT_EXTENSION_NAME );
#if defined(__APPLE__) && defined( USE_MoltenVK )
}
@ -1254,6 +1250,19 @@ bool DeviceManager_VK::CreateDeviceAndSwapChain()
static const vk::DynamicLoader dl( "libMoltenVK.dylib" );
#else
enabledExtensions.layers.insert( "VK_LAYER_KHRONOS_validation" );
// SRS - Suppress specific [ WARNING-Shader-OutputNotConsumed ] validation warnings which are by design:
// 0xc81ad50e: vkCreateGraphicsPipelines(): pCreateInfos[0].pVertexInputState Vertex attribute at location X not consumed by vertex shader.
// 0x9805298c: vkCreateGraphicsPipelines(): pCreateInfos[0] fragment shader writes to output location X with no matching attachment.
// SRS - Suppress similar [ UNASSIGNED-CoreValidation-Shader-OutputNotConsumed ] warnings for older Vulkan SDKs:
// 0x609a13b: vertex shader writes to output location X.0 which is not consumed by fragment shader...
// 0x609a13b: Vertex attribute at location X not consumed by vertex shader.
// 0x609a13b: fragment shader writes to output location X with no matching attachment.
#ifdef _WIN32
SetEnvironmentVariable( "VK_LAYER_MESSAGE_ID_FILTER", "0xc81ad50e;0x9805298c;0x609a13b" );
#else
setenv( "VK_LAYER_MESSAGE_ID_FILTER", "0xc81ad50e:0x9805298c:0x609a13b", 1 );
#endif
}
// SRS - make static so ~DynamicLoader() does not prematurely unload vulkan dynamic lib

3
neo/sys/sys_session_local.cpp
View file

@ -2676,6 +2676,9 @@ void idSessionLocal::UpdateSignInManager()
#if defined( USE_DOOMCLASSIC )
// If we don't have a master user at all, then we need to be at "Press Start"
MoveToPressStart( GDM_SP_SIGNIN_CHANGE_POST );
#else
// RB: automatically sign in the first user. This enumerates the savegames #892
session->GetSignInManager().RegisterLocalUser( 0 );
#endif
return;
}