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

Remove logic Op

Browse source
This commit is contained in:
Vincent Lejeune 2015-10-10 00:59:41 +02:00
parent b2a7f0fd11
commit 71552f7ffe
6 changed files with 9 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rpcs3/Emu/RSX/D3D12/D3D12PipelineState.cpp
View file

@ -176,10 +176,10 @@ bool D3D12GSRender::LoadProgram()
} }
} }
if (m_set_logic_op) if (rsx::method_registers[NV4097_SET_LOGIC_OP_ENABLE])
{ {
prop.Blend.RenderTarget[0].LogicOpEnable = true; prop.Blend.RenderTarget[0].LogicOpEnable = true;
prop.Blend.RenderTarget[0].LogicOp = getLogicOp(m_logic_op); prop.Blend.RenderTarget[0].LogicOp = getLogicOp(rsx::method_registers[NV4097_SET_LOGIC_OP]);
} }
if (m_set_blend_color) if (m_set_blend_color)

6
rpcs3/Emu/RSX/GL/GLGSRender.cpp
View file

@ -1666,7 +1666,7 @@ void GLGSRender::end()
Enable(m_set_alpha_test, GL_ALPHA_TEST); Enable(m_set_alpha_test, GL_ALPHA_TEST);
Enable(m_set_blend || m_set_blend_mrt1 || m_set_blend_mrt2 || m_set_blend_mrt3, GL_BLEND); Enable(m_set_blend || m_set_blend_mrt1 || m_set_blend_mrt2 || m_set_blend_mrt3, GL_BLEND);
Enable(m_set_scissor_horizontal && m_set_scissor_vertical, GL_SCISSOR_TEST); Enable(m_set_scissor_horizontal && m_set_scissor_vertical, GL_SCISSOR_TEST);
Enable(m_set_logic_op, GL_LOGIC_OP); // Enable(m_set_logic_op, GL_LOGIC_OP);
Enable(m_set_cull_face, GL_CULL_FACE); Enable(m_set_cull_face, GL_CULL_FACE);
Enable(m_set_dither, GL_DITHER); Enable(m_set_dither, GL_DITHER);
// Enable(m_set_stencil_test, GL_STENCIL_TEST); // Enable(m_set_stencil_test, GL_STENCIL_TEST);
@ -1724,9 +1724,9 @@ void GLGSRender::end()
checkForGlError("glPolygonOffset"); checkForGlError("glPolygonOffset");
} }
if (m_set_logic_op) // if (m_set_logic_op)
{ {
glLogicOp(m_logic_op); // glLogicOp(m_logic_op);
checkForGlError("glLogicOp"); checkForGlError("glLogicOp");
} }

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

@ -1234,18 +1234,12 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
// Logic Ops // Logic Ops
case NV4097_SET_LOGIC_OP_ENABLE: case NV4097_SET_LOGIC_OP_ENABLE:
{
m_set_logic_op = ARGS(0) ? true : false;
notifyBlendStateChange(); notifyBlendStateChange();
break; break;
}
case NV4097_SET_LOGIC_OP: case NV4097_SET_LOGIC_OP:
{
m_logic_op = ARGS(0);
notifyBlendStateChange(); notifyBlendStateChange();
break; break;
}
// Dithering // Dithering
case NV4097_SET_DITHER_ENABLE: case NV4097_SET_DITHER_ENABLE:

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

@ -245,9 +245,6 @@ public:
bool m_set_polygon_stipple; bool m_set_polygon_stipple;
u32 m_polygon_stipple_pattern[32]; u32 m_polygon_stipple_pattern[32];
// Logic Ops
bool m_set_logic_op;
u32 m_logic_op;
// Clearing // Clearing
u32 m_clear_surface_mask; u32 m_clear_surface_mask;
@ -435,7 +432,6 @@ protected:
m_set_blend_mrt1 = false; m_set_blend_mrt1 = false;
m_set_blend_mrt2 = false; m_set_blend_mrt2 = false;
m_set_blend_mrt3 = false; m_set_blend_mrt3 = false;
m_set_logic_op = false;
m_set_cull_face = false; m_set_cull_face = false;
m_set_dither = false; m_set_dither = false;
m_set_scissor_horizontal = false; m_set_scissor_horizontal = false;
@ -467,7 +463,6 @@ protected:
m_cull_face = 0x0405; // GL_BACK m_cull_face = 0x0405; // GL_BACK
m_alpha_func = 0x0207; // GL_ALWAYS m_alpha_func = 0x0207; // GL_ALWAYS
m_alpha_ref = 0.0f; m_alpha_ref = 0.0f;
m_logic_op = 0x1503; // GL_COPY
m_shade_mode = 0x1D01; // GL_SMOOTH m_shade_mode = 0x1D01; // GL_SMOOTH
m_depth_bounds_min = 0.0; m_depth_bounds_min = 0.0;
@ -561,7 +556,6 @@ protected:
m_set_specular = false; m_set_specular = false;
m_set_line_stipple = false; m_set_line_stipple = false;
m_set_polygon_stipple = false; m_set_polygon_stipple = false;
m_set_logic_op = false;
m_set_surface_format = false; m_set_surface_format = false;
m_set_surface_clip_horizontal = false; m_set_surface_clip_horizontal = false;
m_set_surface_clip_vertical = false; m_set_surface_clip_vertical = false;

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

@ -473,7 +473,7 @@ void SetupRsxRenderingStates(vm::ptr<CellGcmContextData>& cntxt)
r.m_set_alpha_test = false; r.m_set_alpha_test = false;
r.m_set_blend = false; r.m_set_blend = false;
r.m_set_blend_mrt1 = r.m_set_blend_mrt2 = r.m_set_blend_mrt3 = false; r.m_set_blend_mrt1 = r.m_set_blend_mrt2 = r.m_set_blend_mrt3 = false;
r.m_set_logic_op = false; // r.m_set_logic_op = false;
r.m_set_cull_face = false; r.m_set_cull_face = false;
r.m_set_depth_bounds_test = false; r.m_set_depth_bounds_test = false;
rsx::method_registers[NV4097_SET_DEPTH_TEST_ENABLE] = false; rsx::method_registers[NV4097_SET_DEPTH_TEST_ENABLE] = false;

4
rpcs3/Gui/RSXDebugger.cpp
View file

@ -501,7 +501,7 @@ void RSXDebugger::GetFlags()
// LIST_FLAGS_ADD("Depth test", render.m_set_depth_test); // LIST_FLAGS_ADD("Depth test", render.m_set_depth_test);
LIST_FLAGS_ADD("Dither", render.m_set_dither); LIST_FLAGS_ADD("Dither", render.m_set_dither);
LIST_FLAGS_ADD("Line smooth", render.m_set_line_smooth); LIST_FLAGS_ADD("Line smooth", render.m_set_line_smooth);
LIST_FLAGS_ADD("Logic op", render.m_set_logic_op); // LIST_FLAGS_ADD("Logic op", render.m_set_logic_op);
LIST_FLAGS_ADD("Poly smooth", render.m_set_poly_smooth); LIST_FLAGS_ADD("Poly smooth", render.m_set_poly_smooth);
LIST_FLAGS_ADD("Poly offset fill", render.m_set_poly_offset_fill); LIST_FLAGS_ADD("Poly offset fill", render.m_set_poly_offset_fill);
LIST_FLAGS_ADD("Poly offset line", render.m_set_poly_offset_line); LIST_FLAGS_ADD("Poly offset line", render.m_set_poly_offset_line);
@ -658,7 +658,7 @@ void RSXDebugger::SetFlags(wxListEvent& event)
// case 4: render.m_set_depth_test ^= true; break; // case 4: render.m_set_depth_test ^= true; break;
case 5: render.m_set_dither ^= true; break; case 5: render.m_set_dither ^= true; break;
case 6: render.m_set_line_smooth ^= true; break; case 6: render.m_set_line_smooth ^= true; break;
case 7: render.m_set_logic_op ^= true; break; // case 7: render.m_set_logic_op ^= true; break;
case 8: render.m_set_poly_smooth ^= true; break; case 8: render.m_set_poly_smooth ^= true; break;
case 9: render.m_set_poly_offset_fill ^= true; break; case 9: render.m_set_poly_offset_fill ^= true; break;
case 10: render.m_set_poly_offset_line ^= true; break; case 10: render.m_set_poly_offset_line ^= true; break;