RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-10-11 22:49:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

rsx: Fix depth_bounds range computation

Browse Source
This commit is contained in:
kd-11
2026-10-09 12:38:31 +03:00
committed by kd-11
parent ffa4c71088
commit 510f4c243e
4 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/Emu/RSX/Common/TextureUtils.cpp
+17
View File
@@ -1851,6 +1851,23 @@ namespace rsx
}
}
// Hardware behaves as if each depth bound is converted into the surface's depth encoding, clamped to the format's range.
f32 clamp_depth_bounds_value(rsx::surface_depth_format2 format, f32 value)
{
switch (format)
{
case rsx::surface_depth_format2::z16_uint:
case rsx::surface_depth_format2::z24s8_uint:
return std::clamp(value, 0.f, 1.f);
case rsx::surface_depth_format2::z16_float:
return std::clamp(value, 0.f, decode_e4m12(0xFFFF));
case rsx::surface_depth_format2::z24s8_float:
return std::max(value, 0.f);
default:
fmt::throw_exception("Unreachable");
}
}
bool is_texcoord_wrapping_mode(rsx::texture_wrap_mode mode)
{
switch (mode)
rpcs3/Emu/RSX/Common/TextureUtils.h
+1
View File
@@ -365,6 +365,7 @@ namespace rsx
bool is_compressed_host_format(const texture_uploader_capabilities& caps, u32 format); // Returns true for host-compressed formats (DXT)
u8 get_format_sample_count(rsx::surface_antialiasing antialias);
f32 get_depth_clear_value(rsx::surface_depth_format2 format, u32 raw);
f32 clamp_depth_bounds_value(rsx::surface_depth_format2 format, f32 value);
bool is_depth_stencil_format(rsx::surface_depth_format2 format);
/**
rpcs3/Emu/RSX/GL/GLDraw.cpp
+6 -2
View File
@@ -91,9 +91,13 @@ void GLGSRender::update_draw_state()
gl_state.depth_func(gl::comparison_op(rsx::method_registers.depth_func()));
}
if (gl::get_driver_caps().EXT_depth_bounds_test_supported && (gl_state.enable(rsx::method_registers.depth_bounds_test_enabled(), GL_DEPTH_BOUNDS_TEST_EXT)))
if (gl::get_driver_caps().EXT_depth_bounds_test_supported &&
(gl_state.enable(REGS(m_ctx)->depth_bounds_test_enabled(), GL_DEPTH_BOUNDS_TEST_EXT)))
{
gl_state.depth_bounds(rsx::method_registers.depth_bounds_min(), rsx::method_registers.depth_bounds_max());
const auto depth_format = REGS(m_ctx)->surface_depth_fmt();
gl_state.depth_bounds(
rsx::clamp_depth_bounds_value(depth_format, REGS(m_ctx)->depth_bounds_min()),
rsx::clamp_depth_bounds_value(depth_format, REGS(m_ctx)->depth_bounds_max()));
}
if (gl::get_driver_caps().NV_depth_buffer_float_supported)
rpcs3/Emu/RSX/VK/VKDraw.cpp
+7 -4
View File
@@ -9,6 +9,8 @@
#include "vkutils/chip_class.h"
#include <vulkan/vulkan_core.h>
#include "Emu/RSX/NV47/HW/context_accessors.define.h"
namespace vk
{
VkImageViewType get_view_type(rsx::texture_dimension_extended type)
@@ -237,11 +239,12 @@ void VKGSRender::update_draw_state()
if (m_device->get_depth_bounds_support())
{
f32 bounds_min, bounds_max;
if (rsx::method_registers.depth_bounds_test_enabled())
if (REGS(m_ctx)->depth_bounds_test_enabled())
{
// Update depth bounds min/max
bounds_min = rsx::method_registers.depth_bounds_min();
bounds_max = rsx::method_registers.depth_bounds_max();
// Update depth bounds min/max, saturated into the RSX depth format's range as hardware does
const auto depth_format = REGS(m_ctx)->surface_depth_fmt();
bounds_min = rsx::clamp_depth_bounds_value(depth_format, REGS(m_ctx)->depth_bounds_min());
bounds_max = rsx::clamp_depth_bounds_value(depth_format, REGS(m_ctx)->depth_bounds_max());
}
else
{