Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-25 05:33:11 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #94267 from RandomShaper/d3d12_db

Browse Source 
D3D12: Avoid enabling depth bounds test if unsupported
This commit is contained in:
Rémi Verschelde 2024-07-17 11:43:39 +02:00
commit ffd6162c76
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/d3d12/rendering_device_driver_d3d12.cpp
View File

@ -5335,10 +5335,12 @@ void RenderingDeviceDriverD3D12::command_bind_render_pipeline(CommandBufferID p_
cmd_buf_info->cmd_list->OMSetBlendFactor(pso_extra_info.dyn_params.blend_constant.components); cmd_buf_info->cmd_list->OMSetBlendFactor(pso_extra_info.dyn_params.blend_constant.components);
cmd_buf_info->cmd_list->OMSetStencilRef(pso_extra_info.dyn_params.stencil_reference); cmd_buf_info->cmd_list->OMSetStencilRef(pso_extra_info.dyn_params.stencil_reference);
ComPtr<ID3D12GraphicsCommandList1> command_list_1; if (misc_features_support.depth_bounds_supported) {
cmd_buf_info->cmd_list->QueryInterface(command_list_1.GetAddressOf()); ComPtr<ID3D12GraphicsCommandList1> command_list_1;
if (command_list_1) { cmd_buf_info->cmd_list->QueryInterface(command_list_1.GetAddressOf());
command_list_1->OMSetDepthBounds(pso_extra_info.dyn_params.depth_bounds_min, pso_extra_info.dyn_params.depth_bounds_max); if (command_list_1) {
command_list_1->OMSetDepthBounds(pso_extra_info.dyn_params.depth_bounds_min, pso_extra_info.dyn_params.depth_bounds_max);
}
} }
cmd_buf_info->render_pass_state.vf_info = pso_extra_info.vf_info; cmd_buf_info->render_pass_state.vf_info = pso_extra_info.vf_info;
@ -5728,8 +5730,15 @@ RDD::PipelineID RenderingDeviceDriverD3D12::render_pipeline_create(
(&pipeline_desc.DepthStencilState)->BackFace.StencilDepthFailOp = RD_TO_D3D12_STENCIL_OP[p_depth_stencil_state.back_op.depth_fail]; (&pipeline_desc.DepthStencilState)->BackFace.StencilDepthFailOp = RD_TO_D3D12_STENCIL_OP[p_depth_stencil_state.back_op.depth_fail];
(&pipeline_desc.DepthStencilState)->BackFace.StencilFunc = RD_TO_D3D12_COMPARE_OP[p_depth_stencil_state.back_op.compare]; (&pipeline_desc.DepthStencilState)->BackFace.StencilFunc = RD_TO_D3D12_COMPARE_OP[p_depth_stencil_state.back_op.compare];
pso_extra_info.dyn_params.depth_bounds_min = p_depth_stencil_state.enable_depth_range ? p_depth_stencil_state.depth_range_min : 0.0f; if (misc_features_support.depth_bounds_supported) {
pso_extra_info.dyn_params.depth_bounds_max = p_depth_stencil_state.enable_depth_range ? p_depth_stencil_state.depth_range_max : 1.0f; pso_extra_info.dyn_params.depth_bounds_min = p_depth_stencil_state.enable_depth_range ? p_depth_stencil_state.depth_range_min : 0.0f;
pso_extra_info.dyn_params.depth_bounds_max = p_depth_stencil_state.enable_depth_range ? p_depth_stencil_state.depth_range_max : 1.0f;
} else {
if (p_depth_stencil_state.enable_depth_range) {
WARN_PRINT_ONCE("Depth bounds test is not supported by the GPU driver.");
}
}
pso_extra_info.dyn_params.stencil_reference = p_depth_stencil_state.front_op.reference; pso_extra_info.dyn_params.stencil_reference = p_depth_stencil_state.front_op.reference;
} }
@ -6441,6 +6450,12 @@ Error RenderingDeviceDriverD3D12::_check_capabilities() {
subgroup_capabilities.wave_ops_supported = options1.WaveOps; subgroup_capabilities.wave_ops_supported = options1.WaveOps;
} }
D3D12_FEATURE_DATA_D3D12_OPTIONS2 options2 = {};
res = device->CheckFeatureSupport(D3D12_FEATURE_D3D12_OPTIONS2, &options2, sizeof(options2));
if (SUCCEEDED(res)) {
misc_features_support.depth_bounds_supported = options2.DepthBoundsTestSupported;
}
D3D12_FEATURE_DATA_D3D12_OPTIONS3 options3 = {}; D3D12_FEATURE_DATA_D3D12_OPTIONS3 options3 = {};
res = device->CheckFeatureSupport(D3D12_FEATURE_D3D12_OPTIONS3, &options3, sizeof(options3)); res = device->CheckFeatureSupport(D3D12_FEATURE_D3D12_OPTIONS3, &options3, sizeof(options3));
if (SUCCEEDED(res)) { if (SUCCEEDED(res)) {
@ -6526,6 +6541,12 @@ Error RenderingDeviceDriverD3D12::_check_capabilities() {
print_verbose(String("- D3D12 16-bit ops supported: ") + (shader_capabilities.native_16bit_ops ? "yes" : "no")); print_verbose(String("- D3D12 16-bit ops supported: ") + (shader_capabilities.native_16bit_ops ? "yes" : "no"));
if (misc_features_support.depth_bounds_supported) {
print_verbose("- Depth bounds test supported");
} else {
print_verbose("- Depth bounds test not supported");
}
return OK; return OK;
} }

5
drivers/d3d12/rendering_device_driver_d3d12.h
View File

@ -139,6 +139,10 @@ class RenderingDeviceDriverD3D12 : public RenderingDeviceDriver {
bool enhanced_barriers_supported = false; bool enhanced_barriers_supported = false;
}; };
struct MiscFeaturesSupport {
bool depth_bounds_supported = false;
};
RenderingContextDriverD3D12 *context_driver = nullptr; RenderingContextDriverD3D12 *context_driver = nullptr;
RenderingContextDriver::Device context_device; RenderingContextDriver::Device context_device;
ComPtr<IDXGIAdapter> adapter; ComPtr<IDXGIAdapter> adapter;
@ -154,6 +158,7 @@ class RenderingDeviceDriverD3D12 : public RenderingDeviceDriver {
StorageBufferCapabilities storage_buffer_capabilities; StorageBufferCapabilities storage_buffer_capabilities;
FormatCapabilities format_capabilities; FormatCapabilities format_capabilities;
BarrierCapabilities barrier_capabilities; BarrierCapabilities barrier_capabilities;
MiscFeaturesSupport misc_features_support;
String pipeline_cache_id; String pipeline_cache_id;
class DescriptorsHeap { class DescriptorsHeap {