[Bf-blender-cvs] [b6f640b9534] blender-v3.1-release: Cleanup: Clang-tidy warnings.
Jeroen Bakker
noreply at git.blender.org
Fri Jan 28 16:18:18 CET 2022
Commit: b6f640b9534289d2235f3bcb9689bcc5d58f721d
Author: Jeroen Bakker
Date: Fri Jan 28 16:18:13 2022 +0100
Branches: blender-v3.1-release
https://developer.blender.org/rBb6f640b9534289d2235f3bcb9689bcc5d58f721d
Cleanup: Clang-tidy warnings.
Silence Clang-tidy warnings in gpu module.
===================================================================
M source/blender/gpu/intern/gpu_shader_builder_stubs.cc
M source/blender/gpu/intern/gpu_shader_dependency.cc
===================================================================
diff --git a/source/blender/gpu/intern/gpu_shader_builder_stubs.cc b/source/blender/gpu/intern/gpu_shader_builder_stubs.cc
index 40e54ab4394..716d6e33a81 100644
--- a/source/blender/gpu/intern/gpu_shader_builder_stubs.cc
+++ b/source/blender/gpu/intern/gpu_shader_builder_stubs.cc
@@ -39,6 +39,8 @@
#include "DNA_userdef_types.h"
+#include "NOD_shader.h"
+
#include "DRW_engine.h"
#include "bmesh.h"
@@ -167,7 +169,7 @@ void BKE_mesh_looptri_get_real_edges(const struct Mesh *UNUSED(mesh),
/** \name Stubs of BKE_material.h
* \{ */
-void BKE_material_defaults_free_gpu(void)
+void BKE_material_defaults_free_gpu()
{
/* This function is reachable via GPU_exit. */
}
diff --git a/source/blender/gpu/intern/gpu_shader_dependency.cc b/source/blender/gpu/intern/gpu_shader_dependency.cc
index 3965d796647..5e03f7d0767 100644
--- a/source/blender/gpu/intern/gpu_shader_dependency.cc
+++ b/source/blender/gpu/intern/gpu_shader_dependency.cc
@@ -119,7 +119,7 @@ struct GPUSource {
template<bool check_whole_word = true, bool reversed = false, typename T>
int64_t find_str(const StringRef &input, const T keyword, int64_t offset = 0)
{
- while (1) {
+ while (true) {
if constexpr (reversed) {
offset = input.rfind(keyword, offset);
}
@@ -202,10 +202,10 @@ struct GPUSource {
* - All values needs to be specified using constant literals to avoid compiler differences.
* - All values needs to have the 'u' suffix to avoid GLSL compiler errors.
*/
- void enum_preprocess(void)
+ void enum_preprocess()
{
const StringRefNull input = source;
- std::string output = "";
+ std::string output;
int64_t cursor = 0;
int64_t last_pos = 0;
const bool is_cpp = filename.endswith(".hh");
@@ -220,7 +220,7 @@ struct GPUSource {
continue; \
}
- while (1) {
+ while (true) {
cursor = find_keyword(input, "enum ", cursor);
if (cursor == -1) {
break;
More information about the Bf-blender-cvs
mailing list