archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-11 01:08:39 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove viewport clip

Browse source
This commit is contained in:
Vincent Lejeune 2015-10-10 21:06:17 +02:00
parent 537187687d
commit 16311b36b0
4 changed files with 6 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

21
rpcs3/Emu/RSX/RSXThread.cpp
View file

@ -688,31 +688,10 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
// Viewport // Viewport
case NV4097_SET_VIEWPORT_HORIZONTAL: case NV4097_SET_VIEWPORT_HORIZONTAL:
{
m_set_viewport_horizontal = true;
m_viewport_x = ARGS(0) & 0xffff;
m_viewport_w = ARGS(0) >> 16;
if (count == 2)
{
m_set_viewport_vertical = true;
m_viewport_y = ARGS(1) & 0xffff;
m_viewport_h = ARGS(1) >> 16;
}
//LOG_NOTICE(RSX, "NV4097_SET_VIEWPORT_HORIZONTAL: x=%d, y=%d, w=%d, h=%d", m_viewport_x, m_viewport_y, m_viewport_w, m_viewport_h);
break; break;
}
case NV4097_SET_VIEWPORT_VERTICAL: case NV4097_SET_VIEWPORT_VERTICAL:
{
m_set_viewport_vertical = true;
m_viewport_y = ARGS(0) & 0xffff;
m_viewport_h = ARGS(0) >> 16;
//LOG_NOTICE(RSX, "NV4097_SET_VIEWPORT_VERTICAL: y=%d, h=%d", m_viewport_y, m_viewport_h);
break; break;
}
case NV4097_SET_VIEWPORT_SCALE: case NV4097_SET_VIEWPORT_SCALE:
case NV4097_SET_VIEWPORT_OFFSET: case NV4097_SET_VIEWPORT_OFFSET:

8
rpcs3/Emu/RSX/RSXThread.h
View file

@ -205,12 +205,6 @@ public:
bool m_set_line_smooth; bool m_set_line_smooth;
// Viewport & scissor // Viewport & scissor
bool m_set_viewport_horizontal;
bool m_set_viewport_vertical;
u16 m_viewport_x;
u16 m_viewport_y;
u16 m_viewport_w;
u16 m_viewport_h;
bool m_set_scissor_horizontal; bool m_set_scissor_horizontal;
bool m_set_scissor_vertical; bool m_set_scissor_vertical;
u16 m_scissor_x; u16 m_scissor_x;
@ -481,8 +475,6 @@ protected:
m_set_clip = false; m_set_clip = false;
m_set_depth_bounds_test = false; m_set_depth_bounds_test = false;
m_set_depth_bounds = false; m_set_depth_bounds = false;
m_set_viewport_horizontal = false;
m_set_viewport_vertical = false;
m_set_scissor_horizontal = false; m_set_scissor_horizontal = false;
m_set_scissor_vertical = false; m_set_scissor_vertical = false;
m_set_front_polygon_mode = false; m_set_front_polygon_mode = false;

7
rpcs3/Emu/SysCalls/Modules/cellResc.cpp
View file

@ -486,11 +486,8 @@ void SetupRsxRenderingStates(vm::ptr<CellGcmContextData>& cntxt)
r.m_set_shade_mode = true; r.m_shade_mode = CELL_GCM_SMOOTH; r.m_set_shade_mode = true; r.m_shade_mode = CELL_GCM_SMOOTH;
r.m_set_frequency_divider_operation = CELL_GCM_FREQUENCY_DIVIDE; r.m_set_frequency_divider_operation = CELL_GCM_FREQUENCY_DIVIDE;
r.m_set_viewport_horizontal = r.m_set_viewport_vertical = true; rsx::method_registers[NV4097_SET_SURFACE_CLIP_HORIZONTAL] = s_rescInternalInstance->m_dstWidth << 16;
r.m_viewport_x = 0; rsx::method_registers[NV4097_SET_SURFACE_CLIP_VERTICAL] = s_rescInternalInstance->m_dstHeight << 16;
r.m_viewport_y = 0;
r.m_viewport_w = s_rescInternalInstance->m_dstWidth;
r.m_viewport_h = s_rescInternalInstance->m_dstHeight;
r.m_set_scissor_horizontal = r.m_set_scissor_vertical = true; r.m_set_scissor_horizontal = r.m_set_scissor_vertical = true;
r.m_scissor_x = 0; r.m_scissor_x = 0;

8
rpcs3/Gui/RSXDebugger.cpp
View file

@ -637,10 +637,10 @@ void RSXDebugger::GetSettings()
LIST_SETTINGS_ADD("Surface Offset D", wxString::Format("0x%x", render.m_surface_offset_d)); LIST_SETTINGS_ADD("Surface Offset D", wxString::Format("0x%x", render.m_surface_offset_d));
LIST_SETTINGS_ADD("Surface Offset Z", wxString::Format("0x%x", render.m_surface_offset_z)); LIST_SETTINGS_ADD("Surface Offset Z", wxString::Format("0x%x", render.m_surface_offset_z));
LIST_SETTINGS_ADD("Viewport", wxString::Format("X:%d, Y:%d, W:%d, H:%d", LIST_SETTINGS_ADD("Viewport", wxString::Format("X:%d, Y:%d, W:%d, H:%d",
render.m_viewport_x, rsx::method_registers[NV4097_SET_SURFACE_CLIP_HORIZONTAL] & 0xFFFF,
render.m_viewport_y, rsx::method_registers[NV4097_SET_SURFACE_CLIP_VERTICAL] & 0xFFFF,
render.m_viewport_w, rsx::method_registers[NV4097_SET_SURFACE_CLIP_HORIZONTAL] >> 16,
render.m_viewport_h)); rsx::method_registers[NV4097_SET_SURFACE_CLIP_VERTICAL] >> 16));
#undef LIST_SETTINGS_ADD #undef LIST_SETTINGS_ADD
} }