mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-08-04 00:13:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

vk_rasterizer: Use dynamic state for depth bounds and bias

Browse Source
This commit is contained in:
IndecisiveTurtle 2024-09-15 21:29:17 +03:00
parent f01d075dac
commit 2cf31a3f5a
4 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/video_core/amdgpu/liverpool.h
View File

@ -492,6 +492,11 @@ struct Liverpool {
CullMode CullingMode() const { CullMode CullingMode() const {
return static_cast<CullMode>(cull_front | cull_back << 1); return static_cast<CullMode>(cull_front | cull_back << 1);
} }
bool NeedsBias() const {
return enable_polygon_offset_back || enable_polygon_offset_front ||
enable_polygon_offset_para;
}
}; };
union VsOutputConfig { union VsOutputConfig {

6
src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
View File

@ -134,9 +134,9 @@ GraphicsPipeline::GraphicsPipeline(const Instance& instance_, Scheduler& schedul
}; };
boost::container::static_vector<vk::DynamicState, 14> dynamic_states = { boost::container::static_vector<vk::DynamicState, 14> dynamic_states = {
vk::DynamicState::eViewport, vk::DynamicState::eViewport, vk::DynamicState::eScissor,
vk::DynamicState::eScissor, vk::DynamicState::eBlendConstants, vk::DynamicState::eDepthBounds,
vk::DynamicState::eBlendConstants, vk::DynamicState::eDepthBias,
}; };
if (instance.IsColorWriteEnableSupported()) { if (instance.IsColorWriteEnableSupported()) {

18
src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
View File

@ -210,26 +210,8 @@ bool PipelineCache::RefreshGraphicsKey() {
!regs.depth_render_control.depth_clear_enable; !regs.depth_render_control.depth_clear_enable;
key.depth_stencil.raw |= regs.depth_control.DepthState(); key.depth_stencil.raw |= regs.depth_control.DepthState();
key.depth_stencil.depth_write_enable.Assign(depth_write); key.depth_stencil.depth_write_enable.Assign(depth_write);
if (key.depth_stencil.depth_bounds_enable) {
key.depth_bounds_min = regs.depth_bounds_min;
key.depth_bounds_max = regs.depth_bounds_max;
}
key.depth_bias_enable = regs.polygon_control.enable_polygon_offset_back ||
regs.polygon_control.enable_polygon_offset_front ||
regs.polygon_control.enable_polygon_offset_para;
if (key.depth_bias_enable) {
if (regs.polygon_control.enable_polygon_offset_front) {
key.depth_bias_const_factor = regs.poly_offset.front_offset;
key.depth_bias_slope_factor = regs.poly_offset.front_scale;
} else {
key.depth_bias_const_factor = regs.poly_offset.back_offset;
key.depth_bias_slope_factor = regs.poly_offset.back_scale;
}
key.depth_bias_clamp = regs.poly_offset.depth_bias;
}
const auto ds_format = LiverpoolToVK::DepthFormat(db.z_info.format, db.stencil_info.format); const auto ds_format = LiverpoolToVK::DepthFormat(db.z_info.format, db.stencil_info.format);
if (db.z_info.format != AmdGpu::Liverpool::DepthBuffer::ZFormat::Invalid) { if (db.z_info.format != AmdGpu::Liverpool::DepthBuffer::ZFormat::Invalid) {
key.depth_format = ds_format; key.depth_format = ds_format;
} else { } else {

12
src/video_core/renderer_vulkan/vk_rasterizer.cpp
View File

@ -297,6 +297,18 @@ void Rasterizer::UpdateDynamicState(const GraphicsPipeline& pipeline) {
cmdbuf.setColorWriteEnableEXT(write_ens); cmdbuf.setColorWriteEnableEXT(write_ens);
cmdbuf.setColorWriteMaskEXT(0, write_masks); cmdbuf.setColorWriteMaskEXT(0, write_masks);
} }
if (regs.depth_control.depth_bounds_enable) {
cmdbuf.setDepthBounds(regs.depth_bounds_min, regs.depth_bounds_max);
}
if (regs.polygon_control.NeedsBias()) {
if (regs.polygon_control.enable_polygon_offset_front) {
cmdbuf.setDepthBias(regs.poly_offset.front_offset, regs.poly_offset.depth_bias,
regs.poly_offset.front_scale);
} else {
cmdbuf.setDepthBias(regs.poly_offset.back_offset, regs.poly_offset.depth_bias,
regs.poly_offset.back_scale);
}
}
} }
void Rasterizer::UpdateViewportScissorState() { void Rasterizer::UpdateViewportScissorState() {