archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-04 05:51:27 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

gl/vk: Fix stencil ops

Browse source
This commit is contained in:
kd-11 2017-03-24 12:29:18 +03:00
parent f4a0ff19d5
commit 5b0fddd3e8
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
rpcs3/Emu/RSX/GL/GLRenderTargets.cpp
View file

@ -210,7 +210,10 @@ void GLGSRender::init_buffers(bool skip_reading)
if (std::get<0>(m_rtts.m_bound_depth_stencil)) if (std::get<0>(m_rtts.m_bound_depth_stencil))
{ {
__glcheck draw_fbo.depth = *std::get<1>(m_rtts.m_bound_depth_stencil); if (depth_format == rsx::surface_depth_format::z24s8)
__glcheck draw_fbo.depth_stencil = *std::get<1>(m_rtts.m_bound_depth_stencil);
else
__glcheck draw_fbo.depth = *std::get<1>(m_rtts.m_bound_depth_stencil);
const u32 depth_surface_pitch = rsx::method_registers.surface_z_pitch(); const u32 depth_surface_pitch = rsx::method_registers.surface_z_pitch();
std::get<1>(m_rtts.m_bound_depth_stencil)->set_rsx_pitch(rsx::method_registers.surface_z_pitch()); std::get<1>(m_rtts.m_bound_depth_stencil)->set_rsx_pitch(rsx::method_registers.surface_z_pitch());

3
rpcs3/Emu/RSX/VK/VKGSRender.cpp
View file

@ -898,9 +898,8 @@ void VKGSRender::clear_surface(u32 mask)
if (surface_depth_format == rsx::surface_depth_format::z24s8) if (surface_depth_format == rsx::surface_depth_format::z24s8)
{ {
u8 clear_stencil = rsx::method_registers.stencil_clear_value(); u8 clear_stencil = rsx::method_registers.stencil_clear_value();
u32 stencil_mask = rsx::method_registers.stencil_mask();
depth_stencil_clear_values.depthStencil.stencil = stencil_mask; depth_stencil_clear_values.depthStencil.stencil = clear_stencil;
depth_stencil_mask |= VK_IMAGE_ASPECT_STENCIL_BIT; depth_stencil_mask |= VK_IMAGE_ASPECT_STENCIL_BIT;
} }

1
rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp
View file

@ -14,7 +14,6 @@ namespace vk
program::~program() program::~program()
{ {
LOG_ERROR(RSX, "Program destructor invoked!");
vkDestroyPipeline(m_device, pipeline, nullptr); vkDestroyPipeline(m_device, pipeline, nullptr);
} }