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

clean up more output conversions, everything that wants to get printed needs to be explicitly convertex to the wxCharType otherwise the VFormat prints nothing

Browse source
This commit is contained in:
Peter Tissen 2014-02-10 19:51:03 +01:00
parent 427a63f324
commit b05e466e8f
13 changed files with 37 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -187,7 +187,7 @@ void GLVertexDecompilerThread::AddCode(bool is_sca, wxString code, bool src_mask
swizzle = swizzle == "xyzw" ? "" : "." + swizzle;
cond = wxString::Format("if(all(%s(rc%s, vec4(0.0)%s))) ", cond_string_table[d0.cond], swizzle.c_str(), swizzle.c_str());
cond = wxString::Format("if(all(%s(rc%s, vec4(0.0)%s))) ", cond_string_table[d0.cond], wxString(swizzle).wx_str(), wxString(swizzle).wx_str());
}
wxString mask = GetMask(is_sca);
@ -482,7 +482,7 @@ void GLVertexProgram::Compile()
id = glCreateShader(GL_VERTEX_SHADER);
const char* str = shader.c_str();
const char* str = shader.mb_str();
const int strlen = shader.Len();
glShaderSource(id, 1, &str, &strlen);
@ -500,7 +500,7 @@ void GLVertexProgram::Compile()
GLsizei len;
memset(buf, 0, r+1);
glGetShaderInfoLog(id, r, &len, buf);
ConLog.Error("Failed to compile vertex shader: %s", buf);
ConLog.Error("Failed to compile vertex shader: %s", wxString(buf).wx_str());
delete[] buf;
}