RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-04-06 15:05:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Start porting to GNU compiler

Browse source
This commit is contained in:
Mislav Blažević 2013-11-19 11:30:58 +01:00
parent f91bd80bc2
commit d8bd34b57e
84 changed files with 654 additions and 506 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rpcs3/Emu/GS/GL/GLVertexProgram.cpp
View file

@ -20,7 +20,7 @@ wxString GLVertexDecompilerThread::GetMask(bool is_sca)
if(d3.vec_writemask_w) ret += "w";
}
return ret.IsEmpty() || ret == "xyzw" ? wxEmptyString : ("." + ret);
return ret.IsEmpty() || ret == "xyzw" ? wxString(wxEmptyString) : ("." + ret);
}
wxString GLVertexDecompilerThread::GetVecMask()
@ -179,7 +179,7 @@ void GLVertexDecompilerThread::AddCode(bool is_sca, wxString code, bool src_mask
}
//ConLog.Error("cond! %d (%d %s %d %d)", d0.cond, d0.dst_tmp, cond, d1.input_src, d1.const_src);
cond = wxString::Format("if(tmp%d.x %s 0) ", d0.dst_tmp, cond);
cond = wxString::Format("if(tmp%d.x %s 0) ", d0.dst_tmp, cond.mb_str());
}
wxString value = src_mask ? code + GetMask(is_sca) : code;
@ -240,7 +240,7 @@ wxString GLVertexDecompilerThread::BuildCode()
"%s\n"
"void main()\n{\n\tgl_Position = vec4(0.0f, 0.0f, 0.0f, 1.0f);\n%s}\n";
return wxString::Format(prot, p, main);
return wxString::Format(prot, p.mb_str(), main.mb_str());
}
void GLVertexDecompilerThread::Task()