griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Logging: remove explicit newlines

Browse Source 
CLOG adds newlines, including them in the string adds a blank line.
This commit is contained in:
Campbell Barton
2025-06-07 12:13:16 +10:00
parent 23951e1b12
commit def2a2d049
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/gpu/metal/mtl_debug.mm
View File

@@ -83,7 +83,7 @@ void MTLContext::debug_group_end()
break;
}
if (i == 0) {
CLOG_ERROR(&debug::LOG, "Profile GPU error: Extra GPU_debug_group_end() call.\n");
CLOG_ERROR(&debug::LOG, "Profile GPU error: Extra GPU_debug_group_end() call.");
}
}
}
@@ -104,7 +104,7 @@ void MTLContext::process_frame_timings()
for (int i = queries.size() - 1; i >= 0; i--) {
if (!queries[i].finished) {
frame_is_valid = false;
CLOG_ERROR(&debug::LOG, "Profile GPU error: Missing GPU_debug_group_end() call\n");
CLOG_ERROR(&debug::LOG, "Profile GPU error: Missing GPU_debug_group_end() call");
}
break;
}

4
source/blender/gpu/opengl/gl_debug.cc
View File

@@ -441,7 +441,7 @@ void GLContext::debug_group_end()
break;
}
if (i == 0) {
CLOG_ERROR(&LOG, "Profile GPU error: Extra GPU_debug_group_end() call.\n");
CLOG_ERROR(&LOG, "Profile GPU error: Extra GPU_debug_group_end() call.");
}
}
}
@@ -461,7 +461,7 @@ void GLContext::process_frame_timings()
for (int i = queries.size() - 1; i >= 0; i--) {
if (!queries[i].finished) {
frame_is_valid = false;
CLOG_ERROR(&LOG, "Profile GPU error: Missing GPU_debug_group_end() call\n");
CLOG_ERROR(&LOG, "Profile GPU error: Missing GPU_debug_group_end() call");
}
else {
glGetQueryObjectiv(queries.last().handle_end, GL_QUERY_RESULT_AVAILABLE, &frame_is_ready);

4
source/blender/gpu/vulkan/vk_debug.cc
View File

@@ -53,7 +53,7 @@ void VKContext::debug_group_end()
break;
}
if (i == 0) {
CLOG_ERROR(&LOG, "Profile GPU error: Extra GPU_debug_group_end() call.\n");
CLOG_ERROR(&LOG, "Profile GPU error: Extra GPU_debug_group_end() call.");
}
}
}
@@ -71,7 +71,7 @@ void VKContext::process_frame_timings()
for (int i = queries.size() - 1; i >= 0; i--) {
if (!queries[i].finished) {
frame_is_valid = false;
CLOG_ERROR(&LOG, "Profile GPU error: Missing GPU_debug_group_end() call\n");
CLOG_ERROR(&LOG, "Profile GPU error: Missing GPU_debug_group_end() call");
}
break;
}

2
source/blender/io/fbx/importer/fbx_import.cc
View File

@@ -324,7 +324,7 @@ void importer_main(Main *bmain, Scene *scene, ViewLayer *view_layer, const FBXIm
{
FILE *file = BLI_fopen(params.filepath, "rb");
if (!file) {
CLOG_ERROR(&LOG, "Failed to open FBX file '%s'\n", params.filepath);
CLOG_ERROR(&LOG, "Failed to open FBX file '%s'", params.filepath);
BKE_reportf(params.reports, RPT_ERROR, "FBX Import: Cannot open file '%s'", params.filepath);
return;
}

2
source/blender/io/stl/importer/stl_import.cc
View File

@@ -54,7 +54,7 @@ Mesh *read_stl_file(const STLImportParams &import_params)
{
FILE *file = BLI_fopen(import_params.filepath, "rb");
if (!file) {
CLOG_ERROR(&LOG, "Failed to open STL file:'%s'.\n", import_params.filepath);
CLOG_ERROR(&LOG, "Failed to open STL file:'%s'.", import_params.filepath);
BKE_reportf(import_params.reports,
RPT_ERROR,
"STL Import: Cannot open file '%s'",

2
source/blender/io/wavefront_obj/importer/obj_import_file_reader.cc
View File

@@ -429,7 +429,7 @@ OBJParser::OBJParser(const OBJImportParams &import_params, size_t read_buffer_si
{
obj_file_ = BLI_fopen(import_params_.filepath, "rb");
if (!obj_file_) {
CLOG_ERROR(&LOG, "Cannot read from OBJ file:'%s'.\n", import_params_.filepath);
CLOG_ERROR(&LOG, "Cannot read from OBJ file:'%s'.", import_params_.filepath);
BKE_reportf(import_params_.reports,
RPT_ERROR,
"OBJ Import: Cannot open file '%s'",