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

fmt::by_value, fmt::Format removed

Browse source
This commit is contained in:
Nekotekina 2015-08-12 21:38:17 +03:00
parent 15057ffc5e
commit ce494f8847
35 changed files with 340 additions and 372 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rpcs3/Emu/RSX/GL/GLProgram.cpp
View file

@ -23,7 +23,7 @@ int GLProgram::GetLocation(const std::string& name)
m_locations[pos].name = name;
m_locations[pos].loc = glGetUniformLocation(id, name.c_str());
checkForGlError(fmt::Format("glGetUniformLocation(0x%x, %s)", id, name.c_str()));
checkForGlError(fmt::format("glGetUniformLocation(0x%x, %s)", id, name.c_str()));
return m_locations[pos].loc;
}
@ -95,16 +95,16 @@ void GLProgram::Use()
void GLProgram::SetTex(u32 index)
{
int loc = GetLocation(fmt::Format("tex%u", index));
int loc = GetLocation(fmt::format("tex%u", index));
glProgramUniform1i(id, loc, index);
checkForGlError(fmt::Format("SetTex(%u - %d - %d)", id, index, loc));
checkForGlError(fmt::format("SetTex(%u - %d - %d)", id, index, loc));
}
void GLProgram::SetVTex(u32 index)
{
int loc = GetLocation(fmt::Format("vtex%u", index));
int loc = GetLocation(fmt::format("vtex%u", index));
glProgramUniform1i(id, loc, index);
checkForGlError(fmt::Format("SetVTex(%u - %d - %d)", id, index, loc));
checkForGlError(fmt::format("SetVTex(%u - %d - %d)", id, index, loc));
}
void GLProgram::Delete()