Skip to content

Commit

Permalink
Minor changes
Browse files Browse the repository at this point in the history
Irrelevant modifications. None of this affects RPCS3 directly.
  • Loading branch information
AlexAltea committed May 25, 2014
1 parent 948d4ef commit 40f0f80
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# Compiled Static libraries
*.lai
*.la
# *.a
# *.a # Commented out since OpenAL Soft's binaries use this extension.
*.opensdf
*.sdf
*.suo
Expand Down
4 changes: 4 additions & 0 deletions rpcs3/Emu/GS/GCM.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions rpcs3/Emu/GS/GL/GLGSRender.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion rpcs3/Emu/SysCalls/Modules/cellUserInfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
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())
Expand Down
4 changes: 2 additions & 2 deletions rpcs3/Gui/RSXDebugger.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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
}
Expand Down

0 comments on commit 40f0f80

Please sign in to comment.