Merge pull request #6009 from lioncash/async

AsyncShaderCompiler: Make WorkItem-derived class constructors explicit
This commit is contained in:
Stenzek 2017-09-03 14:11:41 +10:00 committed by GitHub
commit 005d0b39f7
4 changed files with 12 additions and 12 deletions

View File

@ -56,7 +56,7 @@ private:
class PixelShaderCompilerWorkItem : public VideoCommon::AsyncShaderCompiler::WorkItem class PixelShaderCompilerWorkItem : public VideoCommon::AsyncShaderCompiler::WorkItem
{ {
public: public:
PixelShaderCompilerWorkItem(const PixelShaderUid& uid); explicit PixelShaderCompilerWorkItem(const PixelShaderUid& uid);
~PixelShaderCompilerWorkItem() override; ~PixelShaderCompilerWorkItem() override;
bool Compile() override; bool Compile() override;
@ -71,7 +71,7 @@ private:
class UberPixelShaderCompilerWorkItem : public VideoCommon::AsyncShaderCompiler::WorkItem class UberPixelShaderCompilerWorkItem : public VideoCommon::AsyncShaderCompiler::WorkItem
{ {
public: public:
UberPixelShaderCompilerWorkItem(const UberShader::PixelShaderUid& uid); explicit UberPixelShaderCompilerWorkItem(const UberShader::PixelShaderUid& uid);
~UberPixelShaderCompilerWorkItem() override; ~UberPixelShaderCompilerWorkItem() override;
bool Compile() override; bool Compile() override;

View File

@ -67,7 +67,7 @@ private:
class VertexShaderCompilerWorkItem : public VideoCommon::AsyncShaderCompiler::WorkItem class VertexShaderCompilerWorkItem : public VideoCommon::AsyncShaderCompiler::WorkItem
{ {
public: public:
VertexShaderCompilerWorkItem(const VertexShaderUid& uid); explicit VertexShaderCompilerWorkItem(const VertexShaderUid& uid);
~VertexShaderCompilerWorkItem() override; ~VertexShaderCompilerWorkItem() override;
bool Compile() override; bool Compile() override;
@ -82,7 +82,7 @@ private:
class UberVertexShaderCompilerWorkItem : public VideoCommon::AsyncShaderCompiler::WorkItem class UberVertexShaderCompilerWorkItem : public VideoCommon::AsyncShaderCompiler::WorkItem
{ {
public: public:
UberVertexShaderCompilerWorkItem(const UberShader::VertexShaderUid& uid); explicit UberVertexShaderCompilerWorkItem(const UberShader::VertexShaderUid& uid);
~UberVertexShaderCompilerWorkItem() override; ~UberVertexShaderCompilerWorkItem() override;
bool Compile() override; bool Compile() override;

View File

@ -146,9 +146,9 @@ private:
class SharedContextAsyncShaderCompiler : public VideoCommon::AsyncShaderCompiler class SharedContextAsyncShaderCompiler : public VideoCommon::AsyncShaderCompiler
{ {
protected: protected:
virtual bool WorkerThreadInitMainThread(void** param) override; bool WorkerThreadInitMainThread(void** param) override;
virtual bool WorkerThreadInitWorkerThread(void* param) override; bool WorkerThreadInitWorkerThread(void* param) override;
virtual void WorkerThreadExit(void* param) override; void WorkerThreadExit(void* param) override;
}; };
struct SharedContextData struct SharedContextData
@ -165,7 +165,7 @@ private:
class ShaderCompileWorkItem : public VideoCommon::AsyncShaderCompiler::WorkItem class ShaderCompileWorkItem : public VideoCommon::AsyncShaderCompiler::WorkItem
{ {
public: public:
ShaderCompileWorkItem(const SHADERUID& uid); explicit ShaderCompileWorkItem(const SHADERUID& uid);
bool Compile() override; bool Compile() override;
void Retrieve() override; void Retrieve() override;
@ -178,7 +178,7 @@ private:
class UberShaderCompileWorkItem : public VideoCommon::AsyncShaderCompiler::WorkItem class UberShaderCompileWorkItem : public VideoCommon::AsyncShaderCompiler::WorkItem
{ {
public: public:
UberShaderCompileWorkItem(const UBERSHADERUID& uid); explicit UberShaderCompileWorkItem(const UBERSHADERUID& uid);
bool Compile() override; bool Compile() override;
void Retrieve() override; void Retrieve() override;

View File

@ -201,7 +201,7 @@ private:
class VertexShaderCompilerWorkItem : public VideoCommon::AsyncShaderCompiler::WorkItem class VertexShaderCompilerWorkItem : public VideoCommon::AsyncShaderCompiler::WorkItem
{ {
public: public:
VertexShaderCompilerWorkItem(const VertexShaderUid& uid) : m_uid(uid) {} explicit VertexShaderCompilerWorkItem(const VertexShaderUid& uid) : m_uid(uid) {}
bool Compile() override; bool Compile() override;
void Retrieve() override; void Retrieve() override;
@ -213,7 +213,7 @@ private:
class PixelShaderCompilerWorkItem : public VideoCommon::AsyncShaderCompiler::WorkItem class PixelShaderCompilerWorkItem : public VideoCommon::AsyncShaderCompiler::WorkItem
{ {
public: public:
PixelShaderCompilerWorkItem(const PixelShaderUid& uid) : m_uid(uid) {} explicit PixelShaderCompilerWorkItem(const PixelShaderUid& uid) : m_uid(uid) {}
bool Compile() override; bool Compile() override;
void Retrieve() override; void Retrieve() override;
@ -225,7 +225,7 @@ private:
class PipelineCompilerWorkItem : public VideoCommon::AsyncShaderCompiler::WorkItem class PipelineCompilerWorkItem : public VideoCommon::AsyncShaderCompiler::WorkItem
{ {
public: public:
PipelineCompilerWorkItem(const PipelineInfo& info) : m_info(info) {} explicit PipelineCompilerWorkItem(const PipelineInfo& info) : m_info(info) {}
bool Compile() override; bool Compile() override;
void Retrieve() override; void Retrieve() override;