From f9512ece77899d3ce1d175cb7701f31085f218fd Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Thu, 29 Oct 2015 13:51:25 +0100 Subject: [PATCH] OGL/ProgramShaderCache: small cleanup Drop an unused function and privatize the cash, er, I mean cache. --- Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp | 5 ----- Source/Core/VideoBackends/OGL/ProgramShaderCache.h | 3 +-- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp index 7d46c0a7fa..17a2821f20 100644 --- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp +++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp @@ -176,11 +176,6 @@ void ProgramShaderCache::UploadConstants() } } -GLuint ProgramShaderCache::GetCurrentProgram() -{ - return CurrentProgram; -} - SHADER* ProgramShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components, u32 primitive_type) { SHADERUID uid; diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.h b/Source/Core/VideoBackends/OGL/ProgramShaderCache.h index 507ec0d3df..2dfb515f06 100644 --- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.h +++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.h @@ -86,10 +86,8 @@ public: } }; - typedef std::map PCache; static PCacheEntry GetShaderProgram(); - static GLuint GetCurrentProgram(); static SHADER* SetShader(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; }; + typedef std::map PCache; static PCache pshaders; static PCacheEntry* last_entry; static SHADERUID last_uid;