ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor changes 

Irrelevant modifications. None of this affects RPCS3 directly.
This commit is contained in:
Alexandro Sánchez Bach 2014-05-25 22:31:40 +02:00
parent 948d4ef3a2
commit 40f0f80f5d
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -9,7 +9,7 @@
# Compiled Static libraries # Compiled Static libraries
*.lai *.lai
*.la *.la
# *.a # *.a # Commented out since OpenAL Soft's binaries use this extension.
*.opensdf *.opensdf
*.sdf *.sdf
*.suo *.suo

4
rpcs3/Emu/GS/GCM.h
View File

@ -71,6 +71,10 @@ enum
CELL_GCM_SURFACE_TARGET_MRT1 = 0x13, CELL_GCM_SURFACE_TARGET_MRT1 = 0x13,
CELL_GCM_SURFACE_TARGET_MRT2 = 0x17, CELL_GCM_SURFACE_TARGET_MRT2 = 0x17,
CELL_GCM_SURFACE_TARGET_MRT3 = 0x1f, CELL_GCM_SURFACE_TARGET_MRT3 = 0x1f,
// Depth
CELL_GCM_SURFACE_Z16 = 1,
CELL_GCM_SURFACE_Z24S8 = 2,
}; };
// GCM Reports // GCM Reports

4
rpcs3/Emu/GS/GL/GLGSRender.cpp
View File

@ -727,12 +727,12 @@ void GLGSRender::ExecCMD()
checkForGlError("m_rbo.Storage(GL_DEPTH_COMPONENT)"); checkForGlError("m_rbo.Storage(GL_DEPTH_COMPONENT)");
break; break;
case 1: case CELL_GCM_SURFACE_Z16:
m_rbo.Storage(GL_DEPTH_COMPONENT16, RSXThread::m_width, RSXThread::m_height); m_rbo.Storage(GL_DEPTH_COMPONENT16, RSXThread::m_width, RSXThread::m_height);
checkForGlError("m_rbo.Storage(GL_DEPTH_COMPONENT16)"); checkForGlError("m_rbo.Storage(GL_DEPTH_COMPONENT16)");
break; break;
case 2: case CELL_GCM_SURFACE_Z24S8:
m_rbo.Storage(GL_DEPTH24_STENCIL8, RSXThread::m_width, RSXThread::m_height); m_rbo.Storage(GL_DEPTH24_STENCIL8, RSXThread::m_width, RSXThread::m_height);
checkForGlError("m_rbo.Storage(GL_DEPTH24_STENCIL8)"); checkForGlError("m_rbo.Storage(GL_DEPTH24_STENCIL8)");
break; break;

2
rpcs3/Emu/SysCalls/Modules/cellUserInfo.cpp
View File

@ -60,7 +60,7 @@ int cellUserInfoGetList(mem32_t listNum, mem_ptr_t<CellUserInfoUserList> listBuf
cellUserInfo.Warning("cellUserInfoGetList(listNum_addr=0x%x, listBuf_addr=0x%x, currentUserId_addr=0x%x)", cellUserInfo.Warning("cellUserInfoGetList(listNum_addr=0x%x, listBuf_addr=0x%x, currentUserId_addr=0x%x)",
listNum.GetAddr(), listBuf.GetAddr(), currentUserId.GetAddr()); 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()) if (listBuf.IsGood() && !listNum.IsGood())
return CELL_USERINFO_ERROR_PARAM; return CELL_USERINFO_ERROR_PARAM;
if (listNum.IsGood()) if (listNum.IsGood())

4
rpcs3/Gui/RSXDebugger.cpp
View File

@ -483,7 +483,7 @@ void RSXDebugger::GetFlags()
LIST_FLAGS_ADD("Alpha test", render.m_set_alpha_test); LIST_FLAGS_ADD("Alpha test", render.m_set_alpha_test);
LIST_FLAGS_ADD("Blend", render.m_set_blend); 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("Cull face", render.m_set_cull_face_enable);
LIST_FLAGS_ADD("Depth bounds test", render.m_set_depth_bounds_test); LIST_FLAGS_ADD("Depth bounds test", render.m_set_depth_bounds_test);
LIST_FLAGS_ADD("Depth test", render.m_depth_test_enable); 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 line", render.m_set_poly_offset_line);
LIST_FLAGS_ADD("Poly offset point", render.m_set_poly_offset_point); 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("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 #undef LIST_FLAGS_ADD
} }