summaryrefslogtreecommitdiff
path: root/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2011-12-11 11:14:02 +0100
committerPierre Bourdon <delroth@gmail.com>2011-12-11 11:14:02 +0100
commitdf283a56a0bc09a455e50ada1aa7e9116a276b44 (patch)
treec70402bba6fd15e51cafae5d0c803f69463c3673 /Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
parent014c474024e28e77d2bb72e0af7acb31850fba64 (diff)
More coding style fixes because I suck at sed
Diffstat (limited to 'Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp')
-rw-r--r--Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
index db41f34024..452ff506c3 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
@@ -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;
}