[Bf-blender-cvs] [e9e493977c0] master: GPUShader: Fix apple clang warnings
Clément Foucault
noreply at git.blender.org
Wed Aug 19 12:00:49 CEST 2020
Commit: e9e493977c0064e47eff92b1d4a25de52f8b8abb
Author: Clément Foucault
Date: Wed Aug 19 11:57:28 2020 +0200
Branches: master
https://developer.blender.org/rBe9e493977c0064e47eff92b1d4a25de52f8b8abb
GPUShader: Fix apple clang warnings
===================================================================
M source/blender/gpu/intern/gpu_shader.cc
M source/blender/gpu/opengl/gl_shader.hh
===================================================================
diff --git a/source/blender/gpu/intern/gpu_shader.cc b/source/blender/gpu/intern/gpu_shader.cc
index 4e74e1f69e7..536396ad3c6 100644
--- a/source/blender/gpu/intern/gpu_shader.cc
+++ b/source/blender/gpu/intern/gpu_shader.cc
@@ -95,7 +95,7 @@ void Shader::print_errors(Span<const char *> sources, char *log)
error_char = (int)strtol(error_line_number_end + 1, NULL, 10);
}
}
- if ((error_line == -1)) {
+ if (error_line == -1) {
found_line_id = false;
}
const char *src_line = sources_combined;
diff --git a/source/blender/gpu/opengl/gl_shader.hh b/source/blender/gpu/opengl/gl_shader.hh
index 0e37ea18d23..b432a04abaa 100644
--- a/source/blender/gpu/opengl/gl_shader.hh
+++ b/source/blender/gpu/opengl/gl_shader.hh
@@ -57,7 +57,7 @@ class GLShader : public Shader {
bool finalize(void) override;
void transform_feedback_names_set(Span<const char *> name_list,
- const eGPUShaderTFBType geom_type);
+ const eGPUShaderTFBType geom_type) override;
bool transform_feedback_enable(GPUVertBuf *buf) override;
void transform_feedback_disable(void) override;
More information about the Bf-blender-cvs
mailing list