Archive/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-05-09 03:58:06 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

More coding style fixes because I suck at sed

Browse source
This commit is contained in:
Pierre Bourdon 2011-12-11 11:14:02 +01:00
parent 014c474024
commit df283a56a0
8 changed files with 155 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
View file

@ -496,11 +496,11 @@ void PixelShaderCache::SetPSSampler(const char * name, unsigned int Tex)
if (!strcmp(name, UniformNames[a]))
{
if(tmp.UniformLocations[a] == -1)
return;
return;
else
{
glUniform1i(tmp.UniformLocations[a], Tex);
return;
glUniform1i(tmp.UniformLocations[a], Tex);
return;
}
}
}
@ -511,11 +511,11 @@ void SetPSConstant4fvByName(const char * name, unsigned int offset, const float
if (!strcmp(name, UniformNames[a]))
{
if(tmp.UniformLocations[a] == -1)
return;
return;
else
{
glUniform4fv(tmp.UniformLocations[a] + offset, count, f);
return;
glUniform4fv(tmp.UniformLocations[a] + offset, count, f);
return;
}
}
}
@ -601,9 +601,9 @@ bool CompileCGPixelShader(FRAGMENTSHADER& ps, const char* pstrprogram)
file.close();
PanicAlert("Failed to compile pixel shader %d!\nThis usually happens when trying to use Dolphin with an outdated GPU or integrated GPU like the Intel GMA series.\n\nIf you're sure this is Dolphin's error anyway, post the contents of %s along with this error message at the forums.\n\nDebug info (%d):\n%s",
num_failures - 1, szTemp,
g_cgfProf,
cgGetLastListing(g_cgcontext));
num_failures - 1, szTemp,
g_cgfProf,
cgGetLastListing(g_cgcontext));
return false;
}