From 40f0f80f5de2266fe6477c1b7ee09e1d55a55d63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexandro=20S=C3=A1nchez=20Bach?= Date: Sun, 25 May 2014 22:31:40 +0200 Subject: [PATCH] Minor changes Irrelevant modifications. None of this affects RPCS3 directly. --- .gitignore | 2 +- rpcs3/Emu/GS/GCM.h | 4 ++++ rpcs3/Emu/GS/GL/GLGSRender.cpp | 4 ++-- rpcs3/Emu/SysCalls/Modules/cellUserInfo.cpp | 2 +- rpcs3/Gui/RSXDebugger.cpp | 4 ++-- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index a03567402d..cfe1dc5f6e 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,7 @@ # Compiled Static libraries *.lai *.la -# *.a +# *.a # Commented out since OpenAL Soft's binaries use this extension. *.opensdf *.sdf *.suo diff --git a/rpcs3/Emu/GS/GCM.h b/rpcs3/Emu/GS/GCM.h index 9a42af58d1..eb3602cdba 100644 --- a/rpcs3/Emu/GS/GCM.h +++ b/rpcs3/Emu/GS/GCM.h @@ -71,6 +71,10 @@ enum CELL_GCM_SURFACE_TARGET_MRT1 = 0x13, CELL_GCM_SURFACE_TARGET_MRT2 = 0x17, CELL_GCM_SURFACE_TARGET_MRT3 = 0x1f, + + // Depth + CELL_GCM_SURFACE_Z16 = 1, + CELL_GCM_SURFACE_Z24S8 = 2, }; // GCM Reports diff --git a/rpcs3/Emu/GS/GL/GLGSRender.cpp b/rpcs3/Emu/GS/GL/GLGSRender.cpp index f620eaacf9..3e5189153b 100644 --- a/rpcs3/Emu/GS/GL/GLGSRender.cpp +++ b/rpcs3/Emu/GS/GL/GLGSRender.cpp @@ -727,12 +727,12 @@ void GLGSRender::ExecCMD() checkForGlError("m_rbo.Storage(GL_DEPTH_COMPONENT)"); break; - case 1: + case CELL_GCM_SURFACE_Z16: m_rbo.Storage(GL_DEPTH_COMPONENT16, RSXThread::m_width, RSXThread::m_height); checkForGlError("m_rbo.Storage(GL_DEPTH_COMPONENT16)"); break; - case 2: + case CELL_GCM_SURFACE_Z24S8: m_rbo.Storage(GL_DEPTH24_STENCIL8, RSXThread::m_width, RSXThread::m_height); checkForGlError("m_rbo.Storage(GL_DEPTH24_STENCIL8)"); break; diff --git a/rpcs3/Emu/SysCalls/Modules/cellUserInfo.cpp b/rpcs3/Emu/SysCalls/Modules/cellUserInfo.cpp index 5fba6b71a0..13a2f0377a 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellUserInfo.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellUserInfo.cpp @@ -60,7 +60,7 @@ int cellUserInfoGetList(mem32_t listNum, mem_ptr_t listBuf cellUserInfo.Warning("cellUserInfoGetList(listNum_addr=0x%x, listBuf_addr=0x%x, currentUserId_addr=0x%x)", listNum.GetAddr(), listBuf.GetAddr(), currentUserId.GetAddr()); - // If only listNum is NULL, an should will be returned + // If only listNum is NULL, an error will be returned if (listBuf.IsGood() && !listNum.IsGood()) return CELL_USERINFO_ERROR_PARAM; if (listNum.IsGood()) diff --git a/rpcs3/Gui/RSXDebugger.cpp b/rpcs3/Gui/RSXDebugger.cpp index 7fbdfc3e5d..4ad1412ef7 100644 --- a/rpcs3/Gui/RSXDebugger.cpp +++ b/rpcs3/Gui/RSXDebugger.cpp @@ -483,7 +483,7 @@ void RSXDebugger::GetFlags() LIST_FLAGS_ADD("Alpha test", render.m_set_alpha_test); LIST_FLAGS_ADD("Blend", render.m_set_blend); - LIST_FLAGS_ADD("Scissor", render.m_set_scissor_horizontal && render.m_set_scissor_vertical); + LIST_FLAGS_ADD("Scissor", render.m_set_scissor_horizontal && render.m_set_scissor_vertical); LIST_FLAGS_ADD("Cull face", render.m_set_cull_face_enable); LIST_FLAGS_ADD("Depth bounds test", render.m_set_depth_bounds_test); LIST_FLAGS_ADD("Depth test", render.m_depth_test_enable); @@ -495,7 +495,7 @@ void RSXDebugger::GetFlags() LIST_FLAGS_ADD("Poly offset line", render.m_set_poly_offset_line); LIST_FLAGS_ADD("Poly offset point", render.m_set_poly_offset_point); LIST_FLAGS_ADD("Stencil test", render.m_set_stencil_test); - LIST_FLAGS_ADD("Primitive restart", render.m_set_restart_index); + LIST_FLAGS_ADD("Primitive restart", render.m_set_restart_index); #undef LIST_FLAGS_ADD }