RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-06 06:55:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

make it compilable, don't merge this, string logs are broken and paths absolute to my machine

Browse source
This commit is contained in:
Peter Tissen 2014-02-10 02:13:13 +01:00
parent 6dcfaf8617
commit 59dcbd3ba3
31 changed files with 465 additions and 227 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -314,16 +314,16 @@ wxString GLVertexDecompilerThread::BuildCode()
for(int i=m_funcs.GetCount() - 1; i>0; --i)
{
fp += wxString::Format("void %s();\n", m_funcs[i].name.mb_str());
fp += wxString::Format("void %s();\n", (const char*)m_funcs[i].name.mb_str());
}
wxString f = wxEmptyString;
f += wxString::Format("void %s()\n{\n\tgl_Position = vec4(0.0f, 0.0f, 0.0f, 1.0f);\n%s}\n", m_funcs[0].name.mb_str(), BuildFuncBody(m_funcs[0]).mb_str());
f += wxString::Format("void %s()\n{\n\tgl_Position = vec4(0.0f, 0.0f, 0.0f, 1.0f);\n%s}\n", (const char*)m_funcs[0].name.mb_str(), (const char*)BuildFuncBody(m_funcs[0]).mb_str());
for(uint i=1; i<m_funcs.GetCount(); ++i)
{
f += wxString::Format("\nvoid %s()\n{\n%s}\n", m_funcs[i].name.mb_str(), BuildFuncBody(m_funcs[i]).mb_str());
f += wxString::Format("\nvoid %s()\n{\n%s}\n", (const char*)m_funcs[i].name.mb_str(), (const char*)BuildFuncBody(m_funcs[i]).mb_str());
}
static const wxString& prot =
@ -333,7 +333,7 @@ wxString GLVertexDecompilerThread::BuildCode()
"%s\n"
"%s";
return wxString::Format(prot, p.mb_str(), fp.mb_str(), f.mb_str());
return wxString::Format(prot, (const char*)p.mb_str(), (const char*)fp.mb_str(), (const char*)f.mb_str());
}
void GLVertexDecompilerThread::Task()