mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-20 06:03:21 +02:00
maxwell_3d: Fix depth clamping register
Using deko3d as reference:
4e47ba0013/source/maxwell/gpu_3d_state.cpp (L42)
We were using bits 3 and 4 to determine depth clamping, but these are
the same both enabled and disabled:
state->depthClampEnable ? 0x101A : 0x181D
The same happens on Nvidia's OpenGL driver, where they do something like
this (default capabilities, GL 4.5 compatibility):
(state & DEPTH_CLAMP) != 0 ? 0x201a : 0x281c
There's always a difference between the first bits in this register, but
bit 11 is consistently disabled on both deko3d/NVN and OpenGL. This
commit changes yuzu's behaviour to use bit 11 to determine depth
clamping.
- Fixes depth issues on Super Mario Odyssey's intro.
This commit is contained in:
parent
1517cba8ca
commit
bb1ed66d99
@ -1179,6 +1179,7 @@ public:
|
|||||||
BitField<0, 1, u32> depth_range_0_1;
|
BitField<0, 1, u32> depth_range_0_1;
|
||||||
BitField<3, 1, u32> depth_clamp_near;
|
BitField<3, 1, u32> depth_clamp_near;
|
||||||
BitField<4, 1, u32> depth_clamp_far;
|
BitField<4, 1, u32> depth_clamp_far;
|
||||||
|
BitField<11, 1, u32> depth_clamp_disabled;
|
||||||
} view_volume_clip_control;
|
} view_volume_clip_control;
|
||||||
|
|
||||||
INSERT_UNION_PADDING_WORDS(0x1F);
|
INSERT_UNION_PADDING_WORDS(0x1F);
|
||||||
|
@ -999,11 +999,7 @@ void RasterizerOpenGL::SyncDepthClamp() {
|
|||||||
}
|
}
|
||||||
flags[Dirty::DepthClampEnabled] = false;
|
flags[Dirty::DepthClampEnabled] = false;
|
||||||
|
|
||||||
const auto& state = gpu.regs.view_volume_clip_control;
|
oglEnable(GL_DEPTH_CLAMP, gpu.regs.view_volume_clip_control.depth_clamp_disabled == 0);
|
||||||
UNIMPLEMENTED_IF_MSG(state.depth_clamp_far != state.depth_clamp_near,
|
|
||||||
"Unimplemented depth clamp separation!");
|
|
||||||
|
|
||||||
oglEnable(GL_DEPTH_CLAMP, state.depth_clamp_far || state.depth_clamp_near);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void RasterizerOpenGL::SyncClipEnabled(u32 clip_mask) {
|
void RasterizerOpenGL::SyncClipEnabled(u32 clip_mask) {
|
||||||
|
@ -81,7 +81,7 @@ void FixedPipelineState::Rasterizer::Fill(const Maxwell& regs) noexcept {
|
|||||||
primitive_restart_enable.Assign(regs.primitive_restart.enabled != 0 ? 1 : 0);
|
primitive_restart_enable.Assign(regs.primitive_restart.enabled != 0 ? 1 : 0);
|
||||||
cull_enable.Assign(regs.cull_test_enabled != 0 ? 1 : 0);
|
cull_enable.Assign(regs.cull_test_enabled != 0 ? 1 : 0);
|
||||||
depth_bias_enable.Assign(enabled_lut[POLYGON_OFFSET_ENABLE_LUT[topology_index]] != 0 ? 1 : 0);
|
depth_bias_enable.Assign(enabled_lut[POLYGON_OFFSET_ENABLE_LUT[topology_index]] != 0 ? 1 : 0);
|
||||||
depth_clamp_enable.Assign(clip.depth_clamp_near == 1 || clip.depth_clamp_far == 1 ? 1 : 0);
|
depth_clamp_disabled.Assign(regs.view_volume_clip_control.depth_clamp_disabled.Value());
|
||||||
ndc_minus_one_to_one.Assign(regs.depth_mode == Maxwell::DepthMode::MinusOneToOne ? 1 : 0);
|
ndc_minus_one_to_one.Assign(regs.depth_mode == Maxwell::DepthMode::MinusOneToOne ? 1 : 0);
|
||||||
cull_face.Assign(PackCullFace(regs.cull_face));
|
cull_face.Assign(PackCullFace(regs.cull_face));
|
||||||
front_face.Assign(packed_front_face);
|
front_face.Assign(packed_front_face);
|
||||||
|
@ -153,7 +153,7 @@ struct FixedPipelineState {
|
|||||||
BitField<4, 1, u32> primitive_restart_enable;
|
BitField<4, 1, u32> primitive_restart_enable;
|
||||||
BitField<5, 1, u32> cull_enable;
|
BitField<5, 1, u32> cull_enable;
|
||||||
BitField<6, 1, u32> depth_bias_enable;
|
BitField<6, 1, u32> depth_bias_enable;
|
||||||
BitField<7, 1, u32> depth_clamp_enable;
|
BitField<7, 1, u32> depth_clamp_disabled;
|
||||||
BitField<8, 1, u32> ndc_minus_one_to_one;
|
BitField<8, 1, u32> ndc_minus_one_to_one;
|
||||||
BitField<9, 2, u32> cull_face;
|
BitField<9, 2, u32> cull_face;
|
||||||
BitField<11, 1, u32> front_face;
|
BitField<11, 1, u32> front_face;
|
||||||
|
@ -249,7 +249,7 @@ vk::Pipeline VKGraphicsPipeline::CreatePipeline(const RenderPassParams& renderpa
|
|||||||
rasterization_ci.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO;
|
rasterization_ci.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO;
|
||||||
rasterization_ci.pNext = nullptr;
|
rasterization_ci.pNext = nullptr;
|
||||||
rasterization_ci.flags = 0;
|
rasterization_ci.flags = 0;
|
||||||
rasterization_ci.depthClampEnable = rs.depth_clamp_enable;
|
rasterization_ci.depthClampEnable = rs.depth_clamp_disabled == 0 ? VK_TRUE : VK_FALSE;
|
||||||
rasterization_ci.rasterizerDiscardEnable = VK_FALSE;
|
rasterization_ci.rasterizerDiscardEnable = VK_FALSE;
|
||||||
rasterization_ci.polygonMode = VK_POLYGON_MODE_FILL;
|
rasterization_ci.polygonMode = VK_POLYGON_MODE_FILL;
|
||||||
rasterization_ci.cullMode =
|
rasterization_ci.cullMode =
|
||||||
|
Loading…
Reference in New Issue
Block a user