From 5059332d954df538b3f771d39435ab2ceec643de Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 2 Sep 2017 17:27:16 -0400 Subject: OGL/ProgramShaderCache: Remove unnecessary virtual keyword This is superfluous, considering the override keyword is present. --- Source/Core/VideoBackends/OGL/ProgramShaderCache.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/Core/VideoBackends/OGL/ProgramShaderCache.h') diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.h b/Source/Core/VideoBackends/OGL/ProgramShaderCache.h index 41b1d4bb41..417c0ee5fd 100644 --- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.h +++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.h @@ -146,9 +146,9 @@ private: class SharedContextAsyncShaderCompiler : public VideoCommon::AsyncShaderCompiler { protected: - virtual bool WorkerThreadInitMainThread(void** param) override; - virtual bool WorkerThreadInitWorkerThread(void* param) override; - virtual void WorkerThreadExit(void* param) override; + bool WorkerThreadInitMainThread(void** param) override; + bool WorkerThreadInitWorkerThread(void* param) override; + void WorkerThreadExit(void* param) override; }; struct SharedContextData -- cgit v1.2.3 From 2d45204f12a9f2ff1cb74b75160dcd391938f30c Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 2 Sep 2017 17:32:26 -0400 Subject: VideoBackends: Add the explicit keyword to WorkItem-derived class constructors Prevents implicit conversions --- Source/Core/VideoBackends/OGL/ProgramShaderCache.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Core/VideoBackends/OGL/ProgramShaderCache.h') diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.h b/Source/Core/VideoBackends/OGL/ProgramShaderCache.h index 417c0ee5fd..d45b2e4cbb 100644 --- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.h +++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.h @@ -165,7 +165,7 @@ private: class ShaderCompileWorkItem : public VideoCommon::AsyncShaderCompiler::WorkItem { public: - ShaderCompileWorkItem(const SHADERUID& uid); + explicit ShaderCompileWorkItem(const SHADERUID& uid); bool Compile() override; void Retrieve() override; @@ -178,7 +178,7 @@ private: class UberShaderCompileWorkItem : public VideoCommon::AsyncShaderCompiler::WorkItem { public: - UberShaderCompileWorkItem(const UBERSHADERUID& uid); + explicit UberShaderCompileWorkItem(const UBERSHADERUID& uid); bool Compile() override; void Retrieve() override; -- cgit v1.2.3