diff options
author | Andrei Karas <akaras@inbox.ru> | 2017-06-06 23:34:34 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2017-06-07 19:23:40 +0300 |
commit | 36ba43d6ea38062b17f7e63ef659962bfc51c64d (patch) | |
tree | 190156cb88b13a38a6d13c69ee0742cc078065a1 /src/render/shaders | |
parent | f1518dd8476c968a43fa57cfb06198e290a4f77a (diff) | |
download | mv-36ba43d6ea38062b17f7e63ef659962bfc51c64d.tar.gz mv-36ba43d6ea38062b17f7e63ef659962bfc51c64d.tar.bz2 mv-36ba43d6ea38062b17f7e63ef659962bfc51c64d.tar.xz mv-36ba43d6ea38062b17f7e63ef659962bfc51c64d.zip |
Fix clang-tidy check readability-implicit-bool-cast.
Diffstat (limited to 'src/render/shaders')
-rw-r--r-- | src/render/shaders/shader.cpp | 2 | ||||
-rw-r--r-- | src/render/shaders/shaderprogram.cpp | 6 | ||||
-rw-r--r-- | src/render/shaders/shadersmanager.cpp | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/render/shaders/shader.cpp b/src/render/shaders/shader.cpp index 97ede0520..f3cb54833 100644 --- a/src/render/shaders/shader.cpp +++ b/src/render/shaders/shader.cpp @@ -34,7 +34,7 @@ Shader::Shader(const unsigned int id) : Shader::~Shader() { - if (mShaderId) + if (mShaderId != 0u) mglDeleteShader(mShaderId); } diff --git a/src/render/shaders/shaderprogram.cpp b/src/render/shaders/shaderprogram.cpp index bd19230b5..52cb025d7 100644 --- a/src/render/shaders/shaderprogram.cpp +++ b/src/render/shaders/shaderprogram.cpp @@ -43,11 +43,11 @@ ShaderProgram::ShaderProgram(const unsigned int id, ShaderProgram::~ShaderProgram() { - if (mProgramId) + if (mProgramId != 0u) mglDeleteProgram(mProgramId); - if (mVertex) + if (mVertex != nullptr) mVertex->decRef(); - if (mFragment) + if (mFragment != nullptr) mFragment->decRef(); } diff --git a/src/render/shaders/shadersmanager.cpp b/src/render/shaders/shadersmanager.cpp index 1180ae880..4d4b68083 100644 --- a/src/render/shaders/shadersmanager.cpp +++ b/src/render/shaders/shadersmanager.cpp @@ -71,20 +71,20 @@ ShaderProgram *ShadersManager::createProgram(const std::string &vertex, { Shader *const vertexShader = static_cast<Shader*>( Loader::getShader(GL_VERTEX_SHADER, vertex)); - if (!vertexShader) + if (vertexShader == nullptr) return nullptr; Shader *const fragmentShader = static_cast<Shader*>( Loader::getShader(GL_FRAGMENT_SHADER, fragment)); - if (!fragmentShader) + if (fragmentShader == nullptr) { vertexShader->decRef(); return nullptr; } GLuint programId = mglCreateProgram(); - if (!programId) + if (programId == 0u) { vertexShader->decRef(); fragmentShader->decRef(); |