mirror of
https://github.com/yuzu-mirror/yuzu.git
synced 2024-09-07 11:39:09 +01:00
Vulkan: Implement Depth Bias Control
This commit is contained in:
parent
9912704234
commit
6a1ecab2dd
4 changed files with 51 additions and 3 deletions
|
@ -1043,15 +1043,34 @@ void RasterizerVulkan::UpdateDepthBias(Tegra::Engines::Maxwell3D::Regs& regs) {
|
||||||
regs.zeta.format == Tegra::DepthFormat::X8Z24_UNORM ||
|
regs.zeta.format == Tegra::DepthFormat::X8Z24_UNORM ||
|
||||||
regs.zeta.format == Tegra::DepthFormat::S8Z24_UNORM ||
|
regs.zeta.format == Tegra::DepthFormat::S8Z24_UNORM ||
|
||||||
regs.zeta.format == Tegra::DepthFormat::V8Z24_UNORM;
|
regs.zeta.format == Tegra::DepthFormat::V8Z24_UNORM;
|
||||||
if (is_d24 && !device.SupportsD24DepthBuffer()) {
|
bool force_unorm = ([&] {
|
||||||
|
if (!is_d24 || device.SupportsD24DepthBuffer()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (device.IsExtDepthBiasControlSupported()) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
// the base formulas can be obtained from here:
|
// the base formulas can be obtained from here:
|
||||||
// https://docs.microsoft.com/en-us/windows/win32/direct3d11/d3d10-graphics-programming-guide-output-merger-stage-depth-bias
|
// https://docs.microsoft.com/en-us/windows/win32/direct3d11/d3d10-graphics-programming-guide-output-merger-stage-depth-bias
|
||||||
const double rescale_factor =
|
const double rescale_factor =
|
||||||
static_cast<double>(1ULL << (32 - 24)) / (static_cast<double>(0x1.ep+127));
|
static_cast<double>(1ULL << (32 - 24)) / (static_cast<double>(0x1.ep+127));
|
||||||
units = static_cast<float>(static_cast<double>(units) * rescale_factor);
|
units = static_cast<float>(static_cast<double>(units) * rescale_factor);
|
||||||
}
|
return false;
|
||||||
|
})();
|
||||||
scheduler.Record([constant = units, clamp = regs.depth_bias_clamp,
|
scheduler.Record([constant = units, clamp = regs.depth_bias_clamp,
|
||||||
factor = regs.slope_scale_depth_bias](vk::CommandBuffer cmdbuf) {
|
factor = regs.slope_scale_depth_bias, force_unorm,
|
||||||
|
precise = device.HasExactDepthBiasControl()](vk::CommandBuffer cmdbuf) {
|
||||||
|
if (force_unorm) {
|
||||||
|
VkDepthBiasRepresentationInfoEXT info{
|
||||||
|
.sType = VK_STRUCTURE_TYPE_DEPTH_BIAS_REPRESENTATION_INFO_EXT,
|
||||||
|
.pNext = nullptr,
|
||||||
|
.depthBiasRepresentation =
|
||||||
|
VK_DEPTH_BIAS_REPRESENTATION_LEAST_REPRESENTABLE_VALUE_FORCE_UNORM_EXT,
|
||||||
|
.depthBiasExact = precise ? VK_TRUE : VK_FALSE,
|
||||||
|
};
|
||||||
|
cmdbuf.SetDepthBias(constant, clamp, factor, &info);
|
||||||
|
return;
|
||||||
|
}
|
||||||
cmdbuf.SetDepthBias(constant, clamp, factor);
|
cmdbuf.SetDepthBias(constant, clamp, factor);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,6 +41,7 @@ VK_DEFINE_HANDLE(VmaAllocator)
|
||||||
// Define all features which may be used by the implementation and require an extension here.
|
// Define all features which may be used by the implementation and require an extension here.
|
||||||
#define FOR_EACH_VK_FEATURE_EXT(FEATURE) \
|
#define FOR_EACH_VK_FEATURE_EXT(FEATURE) \
|
||||||
FEATURE(EXT, CustomBorderColor, CUSTOM_BORDER_COLOR, custom_border_color) \
|
FEATURE(EXT, CustomBorderColor, CUSTOM_BORDER_COLOR, custom_border_color) \
|
||||||
|
FEATURE(EXT, DepthBiasControl, DEPTH_BIAS_CONTROL, depth_bias_control) \
|
||||||
FEATURE(EXT, DepthClipControl, DEPTH_CLIP_CONTROL, depth_clip_control) \
|
FEATURE(EXT, DepthClipControl, DEPTH_CLIP_CONTROL, depth_clip_control) \
|
||||||
FEATURE(EXT, ExtendedDynamicState, EXTENDED_DYNAMIC_STATE, extended_dynamic_state) \
|
FEATURE(EXT, ExtendedDynamicState, EXTENDED_DYNAMIC_STATE, extended_dynamic_state) \
|
||||||
FEATURE(EXT, ExtendedDynamicState2, EXTENDED_DYNAMIC_STATE_2, extended_dynamic_state2) \
|
FEATURE(EXT, ExtendedDynamicState2, EXTENDED_DYNAMIC_STATE_2, extended_dynamic_state2) \
|
||||||
|
@ -93,6 +94,7 @@ VK_DEFINE_HANDLE(VmaAllocator)
|
||||||
// Define extensions where the absence of the extension may result in a degraded experience.
|
// Define extensions where the absence of the extension may result in a degraded experience.
|
||||||
#define FOR_EACH_VK_RECOMMENDED_EXTENSION(EXTENSION_NAME) \
|
#define FOR_EACH_VK_RECOMMENDED_EXTENSION(EXTENSION_NAME) \
|
||||||
EXTENSION_NAME(VK_EXT_CONSERVATIVE_RASTERIZATION_EXTENSION_NAME) \
|
EXTENSION_NAME(VK_EXT_CONSERVATIVE_RASTERIZATION_EXTENSION_NAME) \
|
||||||
|
EXTENSION_NAME(VK_EXT_DEPTH_BIAS_CONTROL_EXTENSION_NAME) \
|
||||||
EXTENSION_NAME(VK_EXT_DEPTH_RANGE_UNRESTRICTED_EXTENSION_NAME) \
|
EXTENSION_NAME(VK_EXT_DEPTH_RANGE_UNRESTRICTED_EXTENSION_NAME) \
|
||||||
EXTENSION_NAME(VK_EXT_EXTENDED_DYNAMIC_STATE_EXTENSION_NAME) \
|
EXTENSION_NAME(VK_EXT_EXTENDED_DYNAMIC_STATE_EXTENSION_NAME) \
|
||||||
EXTENSION_NAME(VK_EXT_EXTENDED_DYNAMIC_STATE_2_EXTENSION_NAME) \
|
EXTENSION_NAME(VK_EXT_EXTENDED_DYNAMIC_STATE_2_EXTENSION_NAME) \
|
||||||
|
@ -143,6 +145,9 @@ VK_DEFINE_HANDLE(VmaAllocator)
|
||||||
// Define features where the absence of the feature may result in a degraded experience.
|
// Define features where the absence of the feature may result in a degraded experience.
|
||||||
#define FOR_EACH_VK_RECOMMENDED_FEATURE(FEATURE_NAME) \
|
#define FOR_EACH_VK_RECOMMENDED_FEATURE(FEATURE_NAME) \
|
||||||
FEATURE_NAME(custom_border_color, customBorderColors) \
|
FEATURE_NAME(custom_border_color, customBorderColors) \
|
||||||
|
FEATURE_NAME(depth_bias_control, depthBiasControl) \
|
||||||
|
FEATURE_NAME(depth_bias_control, leastRepresentableValueForceUnormRepresentation) \
|
||||||
|
FEATURE_NAME(depth_bias_control, depthBiasExact) \
|
||||||
FEATURE_NAME(extended_dynamic_state, extendedDynamicState) \
|
FEATURE_NAME(extended_dynamic_state, extendedDynamicState) \
|
||||||
FEATURE_NAME(index_type_uint8, indexTypeUint8) \
|
FEATURE_NAME(index_type_uint8, indexTypeUint8) \
|
||||||
FEATURE_NAME(primitive_topology_list_restart, primitiveTopologyListRestart) \
|
FEATURE_NAME(primitive_topology_list_restart, primitiveTopologyListRestart) \
|
||||||
|
@ -449,6 +454,12 @@ public:
|
||||||
return extensions.depth_clip_control;
|
return extensions.depth_clip_control;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Returns true if the device supports VK_EXT_depth_bias_control.
|
||||||
|
bool IsExtDepthBiasControlSupported() const {
|
||||||
|
return extensions.depth_bias_control && features.depth_bias_control.depthBiasControl &&
|
||||||
|
features.depth_bias_control.leastRepresentableValueForceUnormRepresentation;
|
||||||
|
}
|
||||||
|
|
||||||
/// Returns true if the device supports VK_EXT_shader_viewport_index_layer.
|
/// Returns true if the device supports VK_EXT_shader_viewport_index_layer.
|
||||||
bool IsExtShaderViewportIndexLayerSupported() const {
|
bool IsExtShaderViewportIndexLayerSupported() const {
|
||||||
return extensions.shader_viewport_index_layer;
|
return extensions.shader_viewport_index_layer;
|
||||||
|
@ -600,6 +611,10 @@ public:
|
||||||
return features.robustness2.nullDescriptor;
|
return features.robustness2.nullDescriptor;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool HasExactDepthBiasControl() const {
|
||||||
|
return features.depth_bias_control.depthBiasExact;
|
||||||
|
}
|
||||||
|
|
||||||
u32 GetMaxVertexInputAttributes() const {
|
u32 GetMaxVertexInputAttributes() const {
|
||||||
return properties.properties.limits.maxVertexInputAttributes;
|
return properties.properties.limits.maxVertexInputAttributes;
|
||||||
}
|
}
|
||||||
|
|
|
@ -109,6 +109,7 @@ void Load(VkDevice device, DeviceDispatch& dld) noexcept {
|
||||||
X(vkCmdPushDescriptorSetWithTemplateKHR);
|
X(vkCmdPushDescriptorSetWithTemplateKHR);
|
||||||
X(vkCmdSetBlendConstants);
|
X(vkCmdSetBlendConstants);
|
||||||
X(vkCmdSetDepthBias);
|
X(vkCmdSetDepthBias);
|
||||||
|
X(vkCmdSetDepthBias2EXT);
|
||||||
X(vkCmdSetDepthBounds);
|
X(vkCmdSetDepthBounds);
|
||||||
X(vkCmdSetEvent);
|
X(vkCmdSetEvent);
|
||||||
X(vkCmdSetScissor);
|
X(vkCmdSetScissor);
|
||||||
|
|
|
@ -222,6 +222,7 @@ struct DeviceDispatch : InstanceDispatch {
|
||||||
PFN_vkCmdSetBlendConstants vkCmdSetBlendConstants{};
|
PFN_vkCmdSetBlendConstants vkCmdSetBlendConstants{};
|
||||||
PFN_vkCmdSetCullModeEXT vkCmdSetCullModeEXT{};
|
PFN_vkCmdSetCullModeEXT vkCmdSetCullModeEXT{};
|
||||||
PFN_vkCmdSetDepthBias vkCmdSetDepthBias{};
|
PFN_vkCmdSetDepthBias vkCmdSetDepthBias{};
|
||||||
|
PFN_vkCmdSetDepthBias2EXT vkCmdSetDepthBias2EXT{};
|
||||||
PFN_vkCmdSetDepthBounds vkCmdSetDepthBounds{};
|
PFN_vkCmdSetDepthBounds vkCmdSetDepthBounds{};
|
||||||
PFN_vkCmdSetDepthBoundsTestEnableEXT vkCmdSetDepthBoundsTestEnableEXT{};
|
PFN_vkCmdSetDepthBoundsTestEnableEXT vkCmdSetDepthBoundsTestEnableEXT{};
|
||||||
PFN_vkCmdSetDepthCompareOpEXT vkCmdSetDepthCompareOpEXT{};
|
PFN_vkCmdSetDepthCompareOpEXT vkCmdSetDepthCompareOpEXT{};
|
||||||
|
@ -1315,6 +1316,18 @@ public:
|
||||||
dld->vkCmdSetDepthBias(handle, constant_factor, clamp, slope_factor);
|
dld->vkCmdSetDepthBias(handle, constant_factor, clamp, slope_factor);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void SetDepthBias(float constant_factor, float clamp, float slope_factor,
|
||||||
|
VkDepthBiasRepresentationInfoEXT* extra) const noexcept {
|
||||||
|
VkDepthBiasInfoEXT info{
|
||||||
|
.sType = VK_STRUCTURE_TYPE_DEPTH_BIAS_INFO_EXT,
|
||||||
|
.pNext = extra,
|
||||||
|
.depthBiasConstantFactor = constant_factor,
|
||||||
|
.depthBiasClamp = clamp,
|
||||||
|
.depthBiasSlopeFactor = slope_factor,
|
||||||
|
};
|
||||||
|
dld->vkCmdSetDepthBias2EXT(handle, &info);
|
||||||
|
}
|
||||||
|
|
||||||
void SetDepthBounds(float min_depth_bounds, float max_depth_bounds) const noexcept {
|
void SetDepthBounds(float min_depth_bounds, float max_depth_bounds) const noexcept {
|
||||||
dld->vkCmdSetDepthBounds(handle, min_depth_bounds, max_depth_bounds);
|
dld->vkCmdSetDepthBounds(handle, min_depth_bounds, max_depth_bounds);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue