mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-27 14:37:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

rsx/fp: Warnings cleanup

Browse Source
This commit is contained in:
kd-11 2019-08-31 14:31:01 +03:00 committed by kd-11
parent 756fdedbf6
commit 0ee9d7b46d
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
rpcs3/Emu/RSX/Common/FragmentProgramDecompiler.cpp
View File

@ -402,17 +402,17 @@ std::string FragmentProgramDecompiler::GetCond()
return "any(" + GetRawCond() + ")"; return "any(" + GetRawCond() + ")";
} }
void FragmentProgramDecompiler::AddCodeCond(const std::string& dst, const std::string& src) void FragmentProgramDecompiler::AddCodeCond(const std::string& lhs, const std::string& rhs)
{ {
if (src0.exec_if_gr && src0.exec_if_lt && src0.exec_if_eq) if (src0.exec_if_gr && src0.exec_if_lt && src0.exec_if_eq)
{ {
AddCode(dst + " = " + src + ";"); AddCode(lhs + " = " + rhs + ";");
return; return;
} }
if (!src0.exec_if_gr && !src0.exec_if_lt && !src0.exec_if_eq) if (!src0.exec_if_gr && !src0.exec_if_lt && !src0.exec_if_eq)
{ {
AddCode("//" + dst + " = " + src + ";"); AddCode("//" + lhs + " = " + rhs + ";");
return; return;
} }
@ -426,17 +426,17 @@ void FragmentProgramDecompiler::AddCodeCond(const std::string& dst, const std::s
bool src_is_fp16 = false; bool src_is_fp16 = false;
if ((opflags & (OPFLAGS::texture_ref | OPFLAGS::src_cast_f32)) == 0 && if ((opflags & (OPFLAGS::texture_ref | OPFLAGS::src_cast_f32)) == 0 &&
src.find("$0") != std::string::npos) rhs.find("$0") != std::string::npos)
{ {
// Texture sample operations are full-width and are exempt // Texture sample operations are full-width and are exempt
src_is_fp16 = (src0.fp16 && src0.reg_type == RSX_FP_REGISTER_TYPE_TEMP); src_is_fp16 = (src0.fp16 && src0.reg_type == RSX_FP_REGISTER_TYPE_TEMP);
if (src_is_fp16 && src.find("$1") != std::string::npos) if (src_is_fp16 && rhs.find("$1") != std::string::npos)
{ {
// References operand 1 // References operand 1
src_is_fp16 = (src1.fp16 && src1.reg_type == RSX_FP_REGISTER_TYPE_TEMP); src_is_fp16 = (src1.fp16 && src1.reg_type == RSX_FP_REGISTER_TYPE_TEMP);
if (src_is_fp16 && src.find("$2") != std::string::npos) if (src_is_fp16 && rhs.find("$2") != std::string::npos)
{ {
// References operand 2 // References operand 2
src_is_fp16 = (src2.fp16 && src2.reg_type == RSX_FP_REGISTER_TYPE_TEMP); src_is_fp16 = (src2.fp16 && src2.reg_type == RSX_FP_REGISTER_TYPE_TEMP);
@ -447,7 +447,7 @@ void FragmentProgramDecompiler::AddCodeCond(const std::string& dst, const std::s
if (src_is_fp16) if (src_is_fp16)
{ {
// LHS argument is of native half type, need to cast to proper type! // LHS argument is of native half type, need to cast to proper type!
if (src[0] != '(') if (rhs[0] != '(')
{ {
// Upcast inputs to processing function instead // Upcast inputs to processing function instead
opflags |= OPFLAGS::src_cast_f32; opflags |= OPFLAGS::src_cast_f32;
@ -460,11 +460,11 @@ void FragmentProgramDecompiler::AddCodeCond(const std::string& dst, const std::s
} }
} }
// NOTE: dst = _select(dst, src, cond) is equivalent to dst = cond? src : dst; // NOTE: x = _select(x, y, cond) is equivalent to x = cond? y : x;
const auto dst_var = ShaderVariable(dst); const auto dst_var = ShaderVariable(lhs);
const auto raw_cond = dst_var.add_mask(GetRawCond()); const auto raw_cond = dst_var.add_mask(GetRawCond());
const auto cond = dst_var.match_size(raw_cond); const auto cond = dst_var.match_size(raw_cond);
AddCode(dst + " = _select(" + dst + ", " + src_prefix + src + ", " + cond + ");"); AddCode(lhs + " = _select(" + lhs + ", " + src_prefix + rhs + ", " + cond + ");");
} }
template<typename T> std::string FragmentProgramDecompiler::GetSRC(T src) template<typename T> std::string FragmentProgramDecompiler::GetSRC(T src)

2
rpcs3/Emu/RSX/Common/FragmentProgramDecompiler.h
View File

@ -183,7 +183,7 @@ class FragmentProgramDecompiler
*/ */
bool DstExpectsSca(); bool DstExpectsSca();
void AddCodeCond(const std::string& dst, const std::string& src); void AddCodeCond(const std::string& lhs, const std::string& rhs);
std::string GetRawCond(); std::string GetRawCond();
std::string GetCond(); std::string GetCond();
template<typename T> std::string GetSRC(T src); template<typename T> std::string GetSRC(T src);