From 6a6fbea5ee16a2116b7b24f52da116ea424e3e56 Mon Sep 17 00:00:00 2001 From: raven02 Date: Sat, 5 Jul 2014 04:01:49 +0800 Subject: [PATCH 1/2] RSX : comment out code for NV4097_SET_SCULL_CONTROL and add LOG_WARNING --- rpcs3/Emu/GS/RSXThread.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rpcs3/Emu/GS/RSXThread.cpp b/rpcs3/Emu/GS/RSXThread.cpp index 4a47ead68b..8115eaf03f 100644 --- a/rpcs3/Emu/GS/RSXThread.cpp +++ b/rpcs3/Emu/GS/RSXThread.cpp @@ -1232,12 +1232,17 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t& args, const u3 case NV4097_SET_SCULL_CONTROL: { + if (ARGS(0)) + LOG_WARNING(RSX, "NV4097_SET_SCULL_CONTROL: %x", ARGS(0)); + + /* This is stencil culling , nothing to do with stencil masking on regular color or depth buffer const u32 a0 = ARGS(0); m_set_stencil_func = m_set_stencil_func_ref = m_set_stencil_func_mask = true; m_stencil_func = a0 & 0xffff; m_stencil_func_ref = (a0 >> 16) & 0xff; m_stencil_func_mask = (a0 >> 24) & 0xff; + */ } break; From 1fc3654ca424e8eab9b345e07596f609be75e229 Mon Sep 17 00:00:00 2001 From: raven02 Date: Sat, 5 Jul 2014 04:07:15 +0800 Subject: [PATCH 2/2] Comment style change --- rpcs3/Emu/GS/RSXThread.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/rpcs3/Emu/GS/RSXThread.cpp b/rpcs3/Emu/GS/RSXThread.cpp index 8115eaf03f..8901fab043 100644 --- a/rpcs3/Emu/GS/RSXThread.cpp +++ b/rpcs3/Emu/GS/RSXThread.cpp @@ -1235,14 +1235,13 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t& args, const u3 if (ARGS(0)) LOG_WARNING(RSX, "NV4097_SET_SCULL_CONTROL: %x", ARGS(0)); - /* This is stencil culling , nothing to do with stencil masking on regular color or depth buffer - const u32 a0 = ARGS(0); - m_set_stencil_func = m_set_stencil_func_ref = m_set_stencil_func_mask = true; + //This is stencil culling , nothing to do with stencil masking on regular color or depth buffer + //const u32 a0 = ARGS(0); + //m_set_stencil_func = m_set_stencil_func_ref = m_set_stencil_func_mask = true; - m_stencil_func = a0 & 0xffff; - m_stencil_func_ref = (a0 >> 16) & 0xff; - m_stencil_func_mask = (a0 >> 24) & 0xff; - */ + //m_stencil_func = a0 & 0xffff; + //m_stencil_func_ref = (a0 >> 16) & 0xff; + //m_stencil_func_mask = (a0 >> 24) & 0xff; } break;