diff --git a/rpcs3/Emu/RSX/Common/FragmentProgramDecompiler.h b/rpcs3/Emu/RSX/Common/FragmentProgramDecompiler.h index 92761b7769..3b873f7b27 100644 --- a/rpcs3/Emu/RSX/Common/FragmentProgramDecompiler.h +++ b/rpcs3/Emu/RSX/Common/FragmentProgramDecompiler.h @@ -88,7 +88,7 @@ protected: /** returns string calling saturate function. */ virtual std::string saturate(const std::string &code) = 0; - /** returns string calling comparaison function on 2 args passed as strings. + /** returns string calling comparison function on 2 args passed as strings. */ virtual std::string compareFunction(COMPARE, const std::string &, const std::string &) = 0; diff --git a/rpcs3/Emu/RSX/Common/VertexProgramDecompiler.h b/rpcs3/Emu/RSX/Common/VertexProgramDecompiler.h index 9ac403340d..d0d99c72fb 100644 --- a/rpcs3/Emu/RSX/Common/VertexProgramDecompiler.h +++ b/rpcs3/Emu/RSX/Common/VertexProgramDecompiler.h @@ -97,7 +97,7 @@ protected: */ virtual std::string getFunction(FUNCTION) = 0; - /** returns string calling comparaison function on 2 args passed as strings. + /** returns string calling comparison function on 2 args passed as strings. */ virtual std::string compareFunction(COMPARE, const std::string &, const std::string &) = 0; diff --git a/rpcs3/Emu/RSX/D3D12/D3D12Formats.cpp b/rpcs3/Emu/RSX/D3D12/D3D12Formats.cpp index d4c1ff9e23..ce3a481db3 100644 --- a/rpcs3/Emu/RSX/D3D12/D3D12Formats.cpp +++ b/rpcs3/Emu/RSX/D3D12/D3D12Formats.cpp @@ -130,18 +130,18 @@ D3D12_STENCIL_OP get_stencil_op(rsx::stencil_op op) throw EXCEPTION("Invalid stencil op (0x%x)", op); } -D3D12_COMPARISON_FUNC get_compare_func(rsx::comparaison_function op) +D3D12_COMPARISON_FUNC get_compare_func(rsx::comparison_function op) { switch (op) { - case rsx::comparaison_function::never: return D3D12_COMPARISON_FUNC_NEVER; - case rsx::comparaison_function::less: return D3D12_COMPARISON_FUNC_LESS; - case rsx::comparaison_function::equal: return D3D12_COMPARISON_FUNC_EQUAL; - case rsx::comparaison_function::less_or_equal: return D3D12_COMPARISON_FUNC_LESS_EQUAL; - case rsx::comparaison_function::greater: return D3D12_COMPARISON_FUNC_GREATER; - case rsx::comparaison_function::not_equal: return D3D12_COMPARISON_FUNC_NOT_EQUAL; - case rsx::comparaison_function::greater_or_equal: return D3D12_COMPARISON_FUNC_GREATER_EQUAL; - case rsx::comparaison_function::always: return D3D12_COMPARISON_FUNC_ALWAYS; + case rsx::comparison_function::never: return D3D12_COMPARISON_FUNC_NEVER; + case rsx::comparison_function::less: return D3D12_COMPARISON_FUNC_LESS; + case rsx::comparison_function::equal: return D3D12_COMPARISON_FUNC_EQUAL; + case rsx::comparison_function::less_or_equal: return D3D12_COMPARISON_FUNC_LESS_EQUAL; + case rsx::comparison_function::greater: return D3D12_COMPARISON_FUNC_GREATER; + case rsx::comparison_function::not_equal: return D3D12_COMPARISON_FUNC_NOT_EQUAL; + case rsx::comparison_function::greater_or_equal: return D3D12_COMPARISON_FUNC_GREATER_EQUAL; + case rsx::comparison_function::always: return D3D12_COMPARISON_FUNC_ALWAYS; } throw EXCEPTION("Invalid or unsupported compare func (0x%x)", op); } diff --git a/rpcs3/Emu/RSX/D3D12/D3D12Formats.h b/rpcs3/Emu/RSX/D3D12/D3D12Formats.h index 4f0159ef08..43309513ec 100644 --- a/rpcs3/Emu/RSX/D3D12/D3D12Formats.h +++ b/rpcs3/Emu/RSX/D3D12/D3D12Formats.h @@ -30,7 +30,7 @@ D3D12_STENCIL_OP get_stencil_op(rsx::stencil_op op); /** * Convert GCM comparison function code to D3D12 one. */ -D3D12_COMPARISON_FUNC get_compare_func(rsx::comparaison_function op); +D3D12_COMPARISON_FUNC get_compare_func(rsx::comparison_function op); /** * Convert GCM texture format to an equivalent one supported by D3D12. diff --git a/rpcs3/Emu/RSX/D3D12/D3D12FragmentProgramDecompiler.cpp b/rpcs3/Emu/RSX/D3D12/D3D12FragmentProgramDecompiler.cpp index 1d6d2f26fc..6e2b260a41 100644 --- a/rpcs3/Emu/RSX/D3D12/D3D12FragmentProgramDecompiler.cpp +++ b/rpcs3/Emu/RSX/D3D12/D3D12FragmentProgramDecompiler.cpp @@ -298,22 +298,22 @@ void D3D12FragmentDecompiler::insertMainEnd(std::stringstream & OS) { switch (m_prog.alpha_func) { - case rsx::comparaison_function::equal: + case rsx::comparison_function::equal: OS << " if (isAlphaTested && Out." << first_output_name << ".a != alphaRef) discard;\n"; break; - case rsx::comparaison_function::not_equal: + case rsx::comparison_function::not_equal: OS << " if (isAlphaTested && Out." << first_output_name << ".a == alphaRef) discard;\n"; break; - case rsx::comparaison_function::less_or_equal: + case rsx::comparison_function::less_or_equal: OS << " if (isAlphaTested && Out." << first_output_name << ".a > alphaRef) discard;\n"; break; - case rsx::comparaison_function::less: + case rsx::comparison_function::less: OS << " if (isAlphaTested && Out." << first_output_name << ".a >= alphaRef) discard;\n"; break; - case rsx::comparaison_function::greater: + case rsx::comparison_function::greater: OS << " if (isAlphaTested && Out." << first_output_name << ".a <= alphaRef) discard;\n"; break; - case rsx::comparaison_function::greater_or_equal: + case rsx::comparison_function::greater_or_equal: OS << " if (isAlphaTested && Out." << first_output_name << ".a < alphaRef) discard;\n"; break; } diff --git a/rpcs3/Emu/RSX/GCM.cpp b/rpcs3/Emu/RSX/GCM.cpp index 84dab2cc5f..d2a69a1e60 100644 --- a/rpcs3/Emu/RSX/GCM.cpp +++ b/rpcs3/Emu/RSX/GCM.cpp @@ -792,20 +792,20 @@ rsx::window_pixel_center rsx::to_window_pixel_center(u8 in) throw EXCEPTION("Unknow window pixel center %x", in); } -rsx::comparaison_function rsx::to_comparaison_function(u16 in) +rsx::comparison_function rsx::to_comparison_function(u16 in) { switch (in) { - case CELL_GCM_NEVER: return rsx::comparaison_function::never; - case CELL_GCM_LESS: return rsx::comparaison_function::less; - case CELL_GCM_EQUAL: return rsx::comparaison_function::equal; - case CELL_GCM_LEQUAL: return rsx::comparaison_function::less_or_equal; - case CELL_GCM_GREATER: return rsx::comparaison_function::greater; - case CELL_GCM_NOTEQUAL: return rsx::comparaison_function::not_equal; - case CELL_GCM_GEQUAL: return rsx::comparaison_function::greater_or_equal; - case CELL_GCM_ALWAYS: return rsx::comparaison_function::always; + case CELL_GCM_NEVER: return rsx::comparison_function::never; + case CELL_GCM_LESS: return rsx::comparison_function::less; + case CELL_GCM_EQUAL: return rsx::comparison_function::equal; + case CELL_GCM_LEQUAL: return rsx::comparison_function::less_or_equal; + case CELL_GCM_GREATER: return rsx::comparison_function::greater; + case CELL_GCM_NOTEQUAL: return rsx::comparison_function::not_equal; + case CELL_GCM_GEQUAL: return rsx::comparison_function::greater_or_equal; + case CELL_GCM_ALWAYS: return rsx::comparison_function::always; } - throw EXCEPTION("Wrong comparaison function %x", in); + throw EXCEPTION("Wrong comparison function %x", in); } enum @@ -854,18 +854,18 @@ std::string print_boolean(bool b) } } -std::string print_comparaison_function(comparaison_function f) +std::string print_comparison_function(comparison_function f) { switch (f) { - case comparaison_function::never: return "Never"; - case comparaison_function::less: return "Less"; - case comparaison_function::equal: return "Equal"; - case comparaison_function::less_or_equal: return "Less_equal"; - case comparaison_function::greater: return "Greater"; - case comparaison_function::not_equal: return "Not_equal"; - case comparaison_function::greater_or_equal: return "Greater_equal"; - case comparaison_function::always: return "Always"; + case comparison_function::never: return "Never"; + case comparison_function::less: return "Less"; + case comparison_function::equal: return "Equal"; + case comparison_function::less_or_equal: return "Less_equal"; + case comparison_function::greater: return "Greater"; + case comparison_function::not_equal: return "Not_equal"; + case comparison_function::greater_or_equal: return "Greater_equal"; + case comparison_function::always: return "Always"; } throw; } diff --git a/rpcs3/Emu/RSX/GCM.h b/rpcs3/Emu/RSX/GCM.h index bf4d35c298..123608543a 100644 --- a/rpcs3/Emu/RSX/GCM.h +++ b/rpcs3/Emu/RSX/GCM.h @@ -129,7 +129,7 @@ namespace rsx window_pixel_center to_window_pixel_center(u8 in); - enum class comparaison_function : u8 + enum class comparison_function : u8 { never, less, @@ -141,7 +141,7 @@ namespace rsx always }; - comparaison_function to_comparaison_function(u16 in); + comparison_function to_comparison_function(u16 in); enum class fog_mode : u8 { diff --git a/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp b/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp index 94340a7306..65904b8c98 100644 --- a/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp +++ b/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp @@ -233,22 +233,22 @@ void GLFragmentDecompilerThread::insertMainEnd(std::stringstream & OS) { switch (m_prog.alpha_func) { - case rsx::comparaison_function::equal: + case rsx::comparison_function::equal: OS << " if (bool(alpha_test) && " << first_output_name << ".a != alpha_ref) discard;\n"; break; - case rsx::comparaison_function::not_equal: + case rsx::comparison_function::not_equal: OS << " if (bool(alpha_test) && " << first_output_name << ".a == alpha_ref) discard;\n"; break; - case rsx::comparaison_function::less_or_equal: + case rsx::comparison_function::less_or_equal: OS << " if (bool(alpha_test) && " << first_output_name << ".a > alpha_ref) discard;\n"; break; - case rsx::comparaison_function::less: + case rsx::comparison_function::less: OS << " if (bool(alpha_test) && " << first_output_name << ".a >= alpha_ref) discard;\n"; break; - case rsx::comparaison_function::greater: + case rsx::comparison_function::greater: OS << " if (bool(alpha_test) && " << first_output_name << ".a <= alpha_ref) discard;\n"; break; - case rsx::comparaison_function::greater_or_equal: + case rsx::comparison_function::greater_or_equal: OS << " if (bool(alpha_test) && " << first_output_name << ".a < alpha_ref) discard;\n"; break; } diff --git a/rpcs3/Emu/RSX/GL/GLGSRender.cpp b/rpcs3/Emu/RSX/GL/GLGSRender.cpp index 7c9732dbff..cc365d0610 100644 --- a/rpcs3/Emu/RSX/GL/GLGSRender.cpp +++ b/rpcs3/Emu/RSX/GL/GLGSRender.cpp @@ -62,18 +62,18 @@ extern CellGcmContextData current_context; namespace { - GLenum comparaison_op(rsx::comparaison_function op) + GLenum comparison_op(rsx::comparison_function op) { switch (op) { - case rsx::comparaison_function::never: return GL_NEVER; - case rsx::comparaison_function::less: return GL_LESS; - case rsx::comparaison_function::equal: return GL_EQUAL; - case rsx::comparaison_function::less_or_equal: return GL_LEQUAL; - case rsx::comparaison_function::greater: return GL_GREATER; - case rsx::comparaison_function::not_equal: return GL_NOTEQUAL; - case rsx::comparaison_function::greater_or_equal: return GL_GEQUAL; - case rsx::comparaison_function::always: return GL_ALWAYS; + case rsx::comparison_function::never: return GL_NEVER; + case rsx::comparison_function::less: return GL_LESS; + case rsx::comparison_function::equal: return GL_EQUAL; + case rsx::comparison_function::less_or_equal: return GL_LEQUAL; + case rsx::comparison_function::greater: return GL_GREATER; + case rsx::comparison_function::not_equal: return GL_NOTEQUAL; + case rsx::comparison_function::greater_or_equal: return GL_GEQUAL; + case rsx::comparison_function::always: return GL_ALWAYS; } throw; } @@ -202,7 +202,7 @@ void GLGSRender::begin() if (__glcheck enable(rsx::method_registers.depth_test_enabled(), GL_DEPTH_TEST)) { - __glcheck glDepthFunc(comparaison_op(rsx::method_registers.depth_func())); + __glcheck glDepthFunc(comparison_op(rsx::method_registers.depth_func())); __glcheck glDepthMask(rsx::method_registers.depth_write_enabled()); } @@ -246,14 +246,14 @@ void GLGSRender::begin() if (__glcheck enable(rsx::method_registers.stencil_test_enabled(), GL_STENCIL_TEST)) { - __glcheck glStencilFunc(comparaison_op(rsx::method_registers.stencil_func()), rsx::method_registers.stencil_func_ref(), + __glcheck glStencilFunc(comparison_op(rsx::method_registers.stencil_func()), rsx::method_registers.stencil_func_ref(), rsx::method_registers.stencil_func_mask()); __glcheck glStencilOp(stencil_op(rsx::method_registers.stencil_op_fail()), stencil_op(rsx::method_registers.stencil_op_zfail()), stencil_op(rsx::method_registers.stencil_op_zpass())); if (rsx::method_registers.two_sided_stencil_test_enabled()) { __glcheck glStencilMaskSeparate(GL_BACK, rsx::method_registers.back_stencil_mask()); - __glcheck glStencilFuncSeparate(GL_BACK, comparaison_op(rsx::method_registers.back_stencil_func()), + __glcheck glStencilFuncSeparate(GL_BACK, comparison_op(rsx::method_registers.back_stencil_func()), rsx::method_registers.back_stencil_func_ref(), rsx::method_registers.back_stencil_func_mask()); __glcheck glStencilOpSeparate(GL_BACK, stencil_op(rsx::method_registers.back_stencil_op_fail()), stencil_op(rsx::method_registers.back_stencil_op_zfail()), stencil_op(rsx::method_registers.back_stencil_op_zpass())); diff --git a/rpcs3/Emu/RSX/GL/rsx_gl_cache.cpp b/rpcs3/Emu/RSX/GL/rsx_gl_cache.cpp index 72e88e6b8e..bf47b97616 100644 --- a/rpcs3/Emu/RSX/GL/rsx_gl_cache.cpp +++ b/rpcs3/Emu/RSX/GL/rsx_gl_cache.cpp @@ -458,14 +458,14 @@ rsx::complete_shader glsl_complete_shader(const rsx::decompiled_shader &shader, } { - auto make_comparsion_test = [](rsx::comparaison_function compare_func, const std::string &test, const std::string &a, const std::string &b) -> std::string + auto make_comparsion_test = [](rsx::comparison_function compare_func, const std::string &test, const std::string &a, const std::string &b) -> std::string { - if (compare_func == rsx::comparaison_function::always) + if (compare_func == rsx::comparison_function::always) { return{}; } - if (compare_func == rsx::comparaison_function::never) + if (compare_func == rsx::comparison_function::never) { return "\tdiscard;\n"; } @@ -474,27 +474,27 @@ rsx::complete_shader glsl_complete_shader(const rsx::decompiled_shader &shader, switch (compare_func) { - case rsx::comparaison_function::equal: + case rsx::comparison_function::equal: compare = "=="; break; - case rsx::comparaison_function::not_equal: + case rsx::comparison_function::not_equal: compare = "!="; break; - case rsx::comparaison_function::less_or_equal: + case rsx::comparison_function::less_or_equal: compare = "<="; break; - case rsx::comparaison_function::less: + case rsx::comparison_function::less: compare = "<"; break; - case rsx::comparaison_function::greater: + case rsx::comparison_function::greater: compare = ">"; break; - case rsx::comparaison_function::greater_or_equal: + case rsx::comparison_function::greater_or_equal: compare = ">="; break; } @@ -508,11 +508,11 @@ rsx::complete_shader glsl_complete_shader(const rsx::decompiled_shader &shader, { std::string index_string = std::to_string(index); std::string fetch_texture = "texture_fetch(" + index_string + ", tex" + index_string + " * ftexture" + index_string + "_cm).a"; - finalize += make_comparsion_test((rsx::comparaison_function)state.textures_zfunc[index], "", "0", fetch_texture); + finalize += make_comparsion_test((rsx::comparison_function)state.textures_zfunc[index], "", "0", fetch_texture); } } - finalize += make_comparsion_test((rsx::comparaison_function)state.alpha_func, "alpha_test != 0 && ", "ocol.a", "alpha_ref"); + finalize += make_comparsion_test((rsx::comparison_function)state.alpha_func, "alpha_test != 0 && ", "ocol.a", "alpha_ref"); } break; diff --git a/rpcs3/Emu/RSX/RSXFragmentProgram.h b/rpcs3/Emu/RSX/RSXFragmentProgram.h index 5c88a3c414..f8d576ed86 100644 --- a/rpcs3/Emu/RSX/RSXFragmentProgram.h +++ b/rpcs3/Emu/RSX/RSXFragmentProgram.h @@ -221,7 +221,7 @@ struct RSXFragmentProgram u32 offset; u32 ctrl; u16 unnormalized_coords; - rsx::comparaison_function alpha_func; + rsx::comparison_function alpha_func; bool front_back_color_enabled : 1; bool back_color_diffuse_output : 1; bool back_color_specular_output : 1; diff --git a/rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp b/rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp index 1a1c6f098e..60af864e67 100644 --- a/rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp +++ b/rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp @@ -312,22 +312,22 @@ void VKFragmentDecompilerThread::insertMainEnd(std::stringstream & OS) { switch (m_prog.alpha_func) { - case rsx::comparaison_function::equal: + case rsx::comparison_function::equal: OS << " if (bool(alpha_test) && " << first_output_name << ".a != alpha_ref) discard;\n"; break; - case rsx::comparaison_function::not_equal: + case rsx::comparison_function::not_equal: OS << " if (bool(alpha_test) && " << first_output_name << ".a == alpha_ref) discard;\n"; break; - case rsx::comparaison_function::less_or_equal: + case rsx::comparison_function::less_or_equal: OS << " if (bool(alpha_test) && " << first_output_name << ".a > alpha_ref) discard;\n"; break; - case rsx::comparaison_function::less: + case rsx::comparison_function::less: OS << " if (bool(alpha_test) && " << first_output_name << ".a >= alpha_ref) discard;\n"; break; - case rsx::comparaison_function::greater: + case rsx::comparison_function::greater: OS << " if (bool(alpha_test) && " << first_output_name << ".a <= alpha_ref) discard;\n"; break; - case rsx::comparaison_function::greater_or_equal: + case rsx::comparison_function::greater_or_equal: OS << " if (bool(alpha_test) && " << first_output_name << ".a < alpha_ref) discard;\n"; break; } diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.cpp b/rpcs3/Emu/RSX/VK/VKGSRender.cpp index e2a3e01106..f4f9e14245 100644 --- a/rpcs3/Emu/RSX/VK/VKGSRender.cpp +++ b/rpcs3/Emu/RSX/VK/VKGSRender.cpp @@ -31,25 +31,25 @@ namespace namespace vk { - VkCompareOp compare_op(rsx::comparaison_function op) + VkCompareOp compare_op(rsx::comparison_function op) { switch (op) { - case rsx::comparaison_function::never: + case rsx::comparison_function::never: return VK_COMPARE_OP_NEVER; - case rsx::comparaison_function::greater: + case rsx::comparison_function::greater: return VK_COMPARE_OP_GREATER; - case rsx::comparaison_function::less: + case rsx::comparison_function::less: return VK_COMPARE_OP_LESS; - case rsx::comparaison_function::less_or_equal: + case rsx::comparison_function::less_or_equal: return VK_COMPARE_OP_LESS_OR_EQUAL; - case rsx::comparaison_function::greater_or_equal: + case rsx::comparison_function::greater_or_equal: return VK_COMPARE_OP_GREATER_OR_EQUAL; - case rsx::comparaison_function::equal: + case rsx::comparison_function::equal: return VK_COMPARE_OP_EQUAL; - case rsx::comparaison_function::not_equal: + case rsx::comparison_function::not_equal: return VK_COMPARE_OP_NOT_EQUAL; - case rsx::comparaison_function::always: + case rsx::comparison_function::always: return VK_COMPARE_OP_ALWAYS; default: throw EXCEPTION("Unsupported compare op: 0x%X", op); diff --git a/rpcs3/Emu/RSX/rsx_decode.h b/rpcs3/Emu/RSX/rsx_decode.h index a97d11974d..4f68909204 100644 --- a/rpcs3/Emu/RSX/rsx_decode.h +++ b/rpcs3/Emu/RSX/rsx_decode.h @@ -90,7 +90,7 @@ namespace namespace rsx { std::string print_boolean(bool b); - std::string print_comparaison_function(comparaison_function f); + std::string print_comparison_function(comparison_function f); std::string print_stencil_op(stencil_op op); std::string print_fog_mode(fog_mode op); std::string print_logic_op(logic_op op); @@ -1083,64 +1083,64 @@ struct registers_decoder template<> struct registers_decoder { - static auto decode(u32 value) { return to_comparaison_function(value); } + static auto decode(u32 value) { return to_comparison_function(value); } - static void commit_rsx_state(rsx_state &state, comparaison_function &&decoded_values) + static void commit_rsx_state(rsx_state &state, comparison_function &&decoded_values) { state.m_depth_func = decoded_values; } - static std::string dump(comparaison_function &&decoded_values) + static std::string dump(comparison_function &&decoded_values) { - return "Depth: compare_function = " + print_comparaison_function(decoded_values); + return "Depth: compare_function = " + print_comparison_function(decoded_values); } }; template<> struct registers_decoder { - static auto decode(u32 value) { return to_comparaison_function(value); } + static auto decode(u32 value) { return to_comparison_function(value); } - static void commit_rsx_state(rsx_state &state, comparaison_function &&decoded_values) + static void commit_rsx_state(rsx_state &state, comparison_function &&decoded_values) { state.m_stencil_func = decoded_values; } - static std::string dump(comparaison_function &&decoded_values) + static std::string dump(comparison_function &&decoded_values) { - return "Stencil: (front) compare_function = " + print_comparaison_function(decoded_values); + return "Stencil: (front) compare_function = " + print_comparison_function(decoded_values); } }; template<> struct registers_decoder { - static auto decode(u32 value) { return to_comparaison_function(value); } + static auto decode(u32 value) { return to_comparison_function(value); } - static void commit_rsx_state(rsx_state &state, comparaison_function &&decoded_values) + static void commit_rsx_state(rsx_state &state, comparison_function &&decoded_values) { state.m_back_stencil_func = decoded_values; } - static std::string dump(comparaison_function &&decoded_values) + static std::string dump(comparison_function &&decoded_values) { - return "Stencil: back compare_function = " + print_comparaison_function(decoded_values); + return "Stencil: back compare_function = " + print_comparison_function(decoded_values); } }; template<> struct registers_decoder { - static auto decode(u32 value) { return to_comparaison_function(value); } + static auto decode(u32 value) { return to_comparison_function(value); } - static void commit_rsx_state(rsx_state &state, comparaison_function &&decoded_values) + static void commit_rsx_state(rsx_state &state, comparison_function &&decoded_values) { state.m_alpha_func = decoded_values; } - static std::string dump(comparaison_function &&decoded_values) + static std::string dump(comparison_function &&decoded_values) { - return "Alpha: compare_function = " + print_comparaison_function(decoded_values); + return "Alpha: compare_function = " + print_comparison_function(decoded_values); } }; diff --git a/rpcs3/Emu/RSX/rsx_methods.cpp b/rpcs3/Emu/RSX/rsx_methods.cpp index 48323da82d..353f6f3a17 100644 --- a/rpcs3/Emu/RSX/rsx_methods.cpp +++ b/rpcs3/Emu/RSX/rsx_methods.cpp @@ -794,7 +794,7 @@ namespace rsx m_scissor_origin_y = 0; m_alpha_test_enabled = false; - m_alpha_func = rsx::comparaison_function::always; + m_alpha_func = rsx::comparison_function::always; m_alpha_ref = 0; m_blend_enabled = false; @@ -816,7 +816,7 @@ namespace rsx m_stencil_test_enabled = false; m_two_sided_stencil_test_enabled = false; m_stencil_mask = 0xff; - m_stencil_func = rsx::comparaison_function::always; + m_stencil_func = rsx::comparison_function::always; m_stencil_func_ref = 0; m_stencil_func_mask = 0xff; m_stencil_op_fail = rsx::stencil_op::keep; @@ -824,7 +824,7 @@ namespace rsx m_stencil_op_zpass = rsx::stencil_op::keep; m_back_stencil_mask = 0xff; - m_back_stencil_func = rsx::comparaison_function::always; + m_back_stencil_func = rsx::comparison_function::always; m_back_stencil_func_ref = 0; m_back_stencil_func_mask = 0xff; m_back_stencil_op_fail = rsx::stencil_op::keep; @@ -851,7 +851,7 @@ namespace rsx m_fog_params_1 = 1.f; m_depth_test_enabled = false; - m_depth_func = rsx::comparaison_function::less; + m_depth_func = rsx::comparison_function::less; m_depth_write_enabled = true; m_poly_offset_scale = 0.f; @@ -876,7 +876,7 @@ namespace rsx m_context_dma_report = rsx::blit_engine::context_dma::to_memory_get_report; m_two_side_light_enabled = true; - m_alpha_func = rsx::comparaison_function::always; + m_alpha_func = rsx::comparison_function::always; // Reset vertex attrib array for (int i = 0; i < 16; i++) diff --git a/rpcs3/Emu/RSX/rsx_methods.h b/rpcs3/Emu/RSX/rsx_methods.h index abbeb7678b..4238240f3b 100644 --- a/rpcs3/Emu/RSX/rsx_methods.h +++ b/rpcs3/Emu/RSX/rsx_methods.h @@ -166,7 +166,7 @@ namespace rsx bool m_alpha_test_enabled : 1; u8 m_alpha_ref; - comparaison_function m_alpha_func : 3; + comparison_function m_alpha_func : 3; bool m_restart_index_enabled : 1; u32 m_restart_index; @@ -193,7 +193,7 @@ namespace rsx bool m_depth_bounds_test_enabled : 1; bool m_depth_test_enabled : 1; bool m_depth_write_enabled : 1; - comparaison_function m_depth_func : 3; + comparison_function m_depth_func : 3; f32 m_depth_bounds_min; f32 m_depth_bounds_max; f32 m_clip_min; @@ -206,8 +206,8 @@ namespace rsx u8 m_back_stencil_func_ref; u8 m_stencil_func_mask; u8 m_back_stencil_func_mask; - comparaison_function m_stencil_func : 3; - comparaison_function m_back_stencil_func : 3; + comparison_function m_stencil_func : 3; + comparison_function m_back_stencil_func : 3; stencil_op m_stencil_op_fail : 3; stencil_op m_stencil_op_zfail : 3; stencil_op m_stencil_op_zpass : 3; @@ -631,17 +631,17 @@ namespace rsx return m_two_sided_stencil_test_enabled; } - comparaison_function depth_func() const + comparison_function depth_func() const { return m_depth_func; } - comparaison_function stencil_func() const + comparison_function stencil_func() const { return m_stencil_func; } - comparaison_function back_stencil_func() const + comparison_function back_stencil_func() const { return m_back_stencil_func; } @@ -971,7 +971,7 @@ namespace rsx return m_fog_equation; } - comparaison_function alpha_func() const + comparison_function alpha_func() const { return m_alpha_func; }