Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Foucault <foucault.clem@gmail.com>2020-08-19 12:57:28 +0300
committerClément Foucault <foucault.clem@gmail.com>2020-08-19 12:57:28 +0300
commite9e493977c0064e47eff92b1d4a25de52f8b8abb (patch)
treed6a89fb8d35c7901176eb470077f8cf89dec5147
parentd412a5e6fa53eec2ebde234f932c19d34f995fad (diff)
GPUShader: Fix apple clang warnings
-rw-r--r--source/blender/gpu/intern/gpu_shader.cc2
-rw-r--r--source/blender/gpu/opengl/gl_shader.hh2
2 files changed, 2 insertions, 2 deletions
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;