RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-05 22:47:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Random stuff (#9589)

Browse source 
* minor coding style adjustment

* Qt: simplify osk dialog buttons

* replace std::find_if with convenience functions

* RSX: use sv in swizzle comparison

idk, I'll remove this if it was intentional.

* overlays/osk: rename enter to return

This one confused me and make me look for a bug that caused the "enter" key to be disabled, while it was actually the return key (obviously xD).
This commit is contained in:
Megamouse 2021-01-12 10:59:50 +01:00 • committed by GitHub
parent 838cbe1840
commit 52deff06ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 72 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

26
rpcs3/Emu/RSX/CgBinaryFragmentProgram.cpp
View file

@ -95,10 +95,10 @@ std::string CgBinaryDisasm::GetCondDisAsm()
swizzle += f[src0.cond_swizzle_z];
swizzle += f[src0.cond_swizzle_w];
if (swizzle == ".xxxx") swizzle = ".x";
else if (swizzle == ".yyyy") swizzle = ".y";
else if (swizzle == ".zzzz") swizzle = ".z";
else if (swizzle == ".wwww") swizzle = ".w";
if (swizzle == ".xxxx"sv) swizzle = ".x";
else if (swizzle == ".yyyy"sv) swizzle = ".y";
else if (swizzle == ".zzzz"sv) swizzle = ".z";
else if (swizzle == ".wwww"sv) swizzle = ".w";
if (swizzle == ".xyzw"sv)
{
@ -129,7 +129,6 @@ std::string CgBinaryDisasm::GetCondDisAsm()
{
cond = "FL";
}
else
{
cond = "TR";
@ -212,10 +211,10 @@ template<typename T> std::string CgBinaryDisasm::GetSrcDisAsm(T src)
swizzle += f[src.swizzle_z];
swizzle += f[src.swizzle_w];
if (swizzle == ".xxxx") swizzle = ".x";
else if (swizzle == ".yyyy") swizzle = ".y";
else if (swizzle == ".zzzz") swizzle = ".z";
else if (swizzle == ".wwww") swizzle = ".w";
if (swizzle == ".xxxx"sv) swizzle = ".x";
else if (swizzle == ".yyyy"sv) swizzle = ".y";
else if (swizzle == ".zzzz"sv) swizzle = ".z";
else if (swizzle == ".wwww"sv) swizzle = ".w";
if (swizzle != ".xyzw"sv)
{
@ -404,9 +403,8 @@ void CgBinaryDisasm::TaskFP()
m_else_offsets.push_back(src1.else_offset << 2);
m_end_offsets.push_back(src2.end_offset << 2);
AddCodeAsm("($cond)");
break;
}
break;
case RSX_FP_OPCODE_LOOP:
{
if (!src0.exec_if_eq && !src0.exec_if_gr && !src0.exec_if_lt)
@ -418,9 +416,8 @@ void CgBinaryDisasm::TaskFP()
m_loop_end_offsets.push_back(src2.end_offset << 2);
AddCodeAsm(fmt::format("{ %u, %u, %u }", src1.end_counter, src1.init_counter, src1.increment));
}
break;
}
break;
case RSX_FP_OPCODE_REP:
{
if (!src0.exec_if_eq && !src0.exec_if_gr && !src0.exec_if_lt)
@ -432,9 +429,8 @@ void CgBinaryDisasm::TaskFP()
m_end_offsets.push_back(src2.end_offset << 2);
m_arb_shader += "# RSX_FP_OPCODE_REP_2\n";
}
break;
}
break;
case RSX_FP_OPCODE_RET: AddCodeAsm("$cond"); break;
default: