summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends/OGL/ProgramShaderCache.h
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2014-08-15 14:09:53 -0400
committerLioncash <mathew1800@gmail.com>2014-08-15 14:12:29 -0400
commit960b54670ca3c2625eaaaee725e093b3f03251c5 (patch)
tree1c9349142eab88021ba3af38fc6c4e7134471ca3 /Source/Core/VideoBackends/OGL/ProgramShaderCache.h
parentd5d5580424d92c56f8f3d964e1437c744737c67d (diff)
OGL: Fix brace and body placements
Also got rid of void argument specifiers. These are a carryover from C.
Diffstat (limited to 'Source/Core/VideoBackends/OGL/ProgramShaderCache.h')
-rw-r--r--Source/Core/VideoBackends/OGL/ProgramShaderCache.h22
1 files changed, 14 insertions, 8 deletions
diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.h b/Source/Core/VideoBackends/OGL/ProgramShaderCache.h
index 969a976c27..dd376142be 100644
--- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.h
+++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.h
@@ -25,9 +25,15 @@ public:
bool operator <(const SHADERUID& r) const
{
- if (puid < r.puid) return true;
- if (r.puid < puid) return false;
- if (vuid < r.vuid) return true;
+ if (puid < r.puid)
+ return true;
+
+ if (r.puid < puid)
+ return false;
+
+ if (vuid < r.vuid)
+ return true;
+
return false;
}
@@ -72,8 +78,8 @@ public:
typedef std::map<SHADERUID, PCacheEntry> PCache;
- static PCacheEntry GetShaderProgram(void);
- static GLuint GetCurrentProgram(void);
+ static PCacheEntry GetShaderProgram();
+ static GLuint GetCurrentProgram();
static SHADER* SetShader(DSTALPHA_MODE dstAlphaMode, u32 components);
static void GetShaderId(SHADERUID *uid, DSTALPHA_MODE dstAlphaMode, u32 components);
@@ -81,9 +87,9 @@ public:
static GLuint CompileSingleShader(GLuint type, const char *code);
static void UploadConstants();
- static void Init(void);
- static void Shutdown(void);
- static void CreateHeader(void);
+ static void Init();
+ static void Shutdown();
+ static void CreateHeader();
private:
class ProgramShaderCacheInserter : public LinearDiskCacheReader<SHADERUID, u8>