diff --git a/source/graphics/ColladaManager.cpp b/source/graphics/ColladaManager.cpp index 49b79f3b09..9cdc31b67e 100644 --- a/source/graphics/ColladaManager.cpp +++ b/source/graphics/ColladaManager.cpp @@ -310,9 +310,6 @@ bool CColladaManager::GenerateCachedFile(const VfsPath& sourcePath, FileType typ } CCacheLoader cacheLoader(m_VFS, extn); - MD5 hash; - u32 version; - PrepareCacheKey(hash, version); archiveCachePath = cacheLoader.ArchiveCachePath(sourcePath); diff --git a/source/ps/CConsole.cpp b/source/ps/CConsole.cpp index 5cf0e1d73a..79c98c956d 100644 --- a/source/ps/CConsole.cpp +++ b/source/ps/CConsole.cpp @@ -178,8 +178,6 @@ void CConsole::Render() PROFILE3_GPU("console"); - CFont font(CONSOLE_FONT); - glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); diff --git a/source/ps/XML/Xeromyces.cpp b/source/ps/XML/Xeromyces.cpp index 396d0e10ae..758300c521 100644 --- a/source/ps/XML/Xeromyces.cpp +++ b/source/ps/XML/Xeromyces.cpp @@ -62,24 +62,15 @@ void CXeromyces::Terminate() g_XeromycesStarted = false; } -void CXeromyces::PrepareCacheKey(MD5& hash, u32& version) -{ - // We don't have anything special to add into the hash - UNUSED2(hash); - - // Arbitrary version number - change this if we update the code and - // need to invalidate old users' caches - version = 1; -} - PSRETURN CXeromyces::Load(const PIVFS& vfs, const VfsPath& filename) { ENSURE(g_XeromycesStarted); CCacheLoader cacheLoader(vfs, L".xmb"); - MD5 hash; - u32 version; - PrepareCacheKey(hash, version); + + // Arbitrary version number - change this if we update the code and + // need to invalidate old users' caches + u32 version = 1; VfsPath xmbPath; Status ret = cacheLoader.TryLoadingCached(filename, MD5(), version, xmbPath); @@ -113,9 +104,6 @@ PSRETURN CXeromyces::Load(const PIVFS& vfs, const VfsPath& filename) bool CXeromyces::GenerateCachedXMB(const PIVFS& vfs, const VfsPath& sourcePath, VfsPath& archiveCachePath) { CCacheLoader cacheLoader(vfs, L".xmb"); - MD5 hash; - u32 version; - PrepareCacheKey(hash, version); archiveCachePath = cacheLoader.ArchiveCachePath(sourcePath); diff --git a/source/ps/XML/Xeromyces.h b/source/ps/XML/Xeromyces.h index f92791093c..7daa2695f5 100644 --- a/source/ps/XML/Xeromyces.h +++ b/source/ps/XML/Xeromyces.h @@ -72,8 +72,6 @@ public: static void Terminate(); private: - void PrepareCacheKey(MD5& hash, u32& version); - PSRETURN ConvertFile(const PIVFS& vfs, const VfsPath& filename, const VfsPath& xmbPath); bool ReadXMBFile(const PIVFS& vfs, const VfsPath& filename);