The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-10 08:09:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3208 from Tilka/small_cleanup

Browse Source 
OGL/ProgramShaderCache: small cleanup
This commit is contained in:
flacs 2015-10-29 14:03:15 +01:00
commit c1c311d132
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
View File

@ -176,11 +176,6 @@ void ProgramShaderCache::UploadConstants()
} }
} }
GLuint ProgramShaderCache::GetCurrentProgram()
{
return CurrentProgram;
}
SHADER* ProgramShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components, u32 primitive_type) SHADER* ProgramShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components, u32 primitive_type)
{ {
SHADERUID uid; SHADERUID uid;

3
Source/Core/VideoBackends/OGL/ProgramShaderCache.h
View File

@ -86,10 +86,8 @@ public:
} }
}; };
typedef std::map<SHADERUID, PCacheEntry> PCache;
static PCacheEntry GetShaderProgram(); static PCacheEntry GetShaderProgram();
static GLuint GetCurrentProgram();
static SHADER* SetShader(DSTALPHA_MODE dstAlphaMode, u32 components, u32 primitive_type); static SHADER* SetShader(DSTALPHA_MODE dstAlphaMode, u32 components, u32 primitive_type);
static void GetShaderId(SHADERUID *uid, DSTALPHA_MODE dstAlphaMode, u32 components, u32 primitive_type); static void GetShaderId(SHADERUID *uid, DSTALPHA_MODE dstAlphaMode, u32 components, u32 primitive_type);
@ -108,6 +106,7 @@ private:
void Read(const SHADERUID &key, const u8 *value, u32 value_size) override; void Read(const SHADERUID &key, const u8 *value, u32 value_size) override;
}; };
typedef std::map<SHADERUID, PCacheEntry> PCache;
static PCache pshaders; static PCache pshaders;
static PCacheEntry* last_entry; static PCacheEntry* last_entry;
static SHADERUID last_uid; static SHADERUID last_uid;