Skip to content

Commit 86d06ad

Browse files
committed
Change timing-related debug messages from SPDLOG_INFO to SPDLOG_DEBUG, set the default log level to INFO
Signed-off-by: ZhouFANG <indevn@outlook.com>
1 parent 61e75a8 commit 86d06ad

File tree

7 files changed

+37
-34
lines changed

7 files changed

+37
-34
lines changed

src/include/log_system.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
#ifndef SIMPLERENDER_SRC_INCLUDE_LOG_SYSTEM_H_
1818
#define SIMPLERENDER_SRC_INCLUDE_LOG_SYSTEM_H_
1919

20+
#ifndef SPDLOG_ACTIVE_LEVEL
21+
#define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_INFO
22+
#endif
2023
#include <spdlog/spdlog.h>
2124

2225
namespace simple_renderer {

src/light.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const Vector3f Light::kDefaultDir = Vector3f(0, 0, -1);
2727
const Color Light::kDefaultColor = Color::kWhite;
2828

2929
Light::Light(const std::string &name) : name_(name) {
30-
SPDLOG_INFO("Light: {}", name_);
30+
SPDLOG_DEBUG("Light: {}", name_);
3131
}
3232

3333
} // namespace simple_renderer

src/rasterizer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace simple_renderer {
88

99
Rasterizer::Rasterizer(size_t width, size_t height)
1010
: width_(width), height_(height) {
11-
SPDLOG_INFO("Rasterizer init with {}, {}", width, height);
11+
SPDLOG_DEBUG("Rasterizer init with {}, {}", width, height);
1212
}
1313

1414
std::vector<Fragment> Rasterizer::Rasterize(const Vertex& v0, const Vertex& v1,

src/renderer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ SimpleRenderer::SimpleRenderer(size_t width, size_t height)
3030

3131
bool SimpleRenderer::DrawModel(const Model &model, const Shader &shader, uint32_t *buffer) {
3232
EnsureRenderer(); // 确保渲染器实例存在
33-
SPDLOG_INFO("draw model: {}", model.GetModelPath());
33+
SPDLOG_DEBUG("draw model: {}", model.GetModelPath());
3434
return renderer_->Render(model, shader, buffer);
3535
}
3636

src/renderers/deferred_renderer.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -159,16 +159,16 @@ bool DeferredRenderer::Render(const Model& model, const Shader& shader_in, uint3
159159
auto total_end_time = std::chrono::high_resolution_clock::now();
160160
double total_ms = std::chrono::duration_cast<std::chrono::microseconds>(total_end_time - total_start_time).count() / 1000.0;
161161

162-
SPDLOG_INFO("=== DEFERRED RENDERING PERFORMANCE ===");
162+
SPDLOG_DEBUG("=== DEFERRED RENDERING PERFORMANCE ===");
163163
double sum_ms = vertex_ms + (total_ms - vertex_ms);
164-
SPDLOG_INFO("Vertex Shader: {:8.3f} ms ({:5.1f}%)", vertex_ms, vertex_ms/sum_ms*100);
165-
SPDLOG_INFO("Buffer Alloc: {:8.3f} ms", buffer_alloc_ms);
166-
SPDLOG_INFO("Rasterization: {:8.3f} ms", raster_ms);
167-
SPDLOG_INFO("Fragment Collection: {:8.3f} ms", collect_ms);
168-
SPDLOG_INFO("Fragment Merge: {:8.3f} ms", merge_ms);
169-
SPDLOG_INFO("Deferred Shading: {:8.3f} ms", shade_ms);
170-
SPDLOG_INFO("Total: {:8.3f} ms", vertex_ms + (buffer_alloc_ms + raster_ms + collect_ms + merge_ms + shade_ms));
171-
SPDLOG_INFO("=========================================");
164+
SPDLOG_DEBUG("Vertex Shader: {:8.3f} ms ({:5.1f}%)", vertex_ms, vertex_ms/sum_ms*100);
165+
SPDLOG_DEBUG("Buffer Alloc: {:8.3f} ms", buffer_alloc_ms);
166+
SPDLOG_DEBUG("Rasterization: {:8.3f} ms", raster_ms);
167+
SPDLOG_DEBUG("Fragment Collection: {:8.3f} ms", collect_ms);
168+
SPDLOG_DEBUG("Fragment Merge: {:8.3f} ms", merge_ms);
169+
SPDLOG_DEBUG("Deferred Shading: {:8.3f} ms", shade_ms);
170+
SPDLOG_DEBUG("Total: {:8.3f} ms", vertex_ms + (buffer_alloc_ms + raster_ms + collect_ms + merge_ms + shade_ms));
171+
SPDLOG_DEBUG("=========================================");
172172

173173
return true;
174174
}

src/renderers/per_triangle_renderer.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -155,16 +155,16 @@ bool PerTriangleRenderer::Render(const Model &model, const Shader &shader_in,
155155
.count() /
156156
1000.0;
157157

158-
SPDLOG_INFO("=== PER-TRIANGLE RENDERING PERFORMANCE ===");
158+
SPDLOG_DEBUG("=== PER-TRIANGLE RENDERING PERFORMANCE ===");
159159
double sum_ms = vertex_ms + (total_ms - vertex_ms);
160-
SPDLOG_INFO("Vertex Shader: {:8.3f} ms ({:5.1f}%)", vertex_ms,
160+
SPDLOG_DEBUG("Vertex Shader: {:8.3f} ms ({:5.1f}%)", vertex_ms,
161161
vertex_ms / sum_ms * 100);
162-
SPDLOG_INFO("Buffer Alloc: {:8.3f} ms", buffer_alloc_ms);
163-
SPDLOG_INFO("Rasterization: {:8.3f} ms", raster_ms);
164-
SPDLOG_INFO("Merge: {:8.3f} ms", merge_ms);
165-
SPDLOG_INFO("Total: {:8.3f} ms",
162+
SPDLOG_DEBUG("Buffer Alloc: {:8.3f} ms", buffer_alloc_ms);
163+
SPDLOG_DEBUG("Rasterization: {:8.3f} ms", raster_ms);
164+
SPDLOG_DEBUG("Merge: {:8.3f} ms", merge_ms);
165+
SPDLOG_DEBUG("Total: {:8.3f} ms",
166166
vertex_ms + (buffer_alloc_ms + raster_ms + merge_ms));
167-
SPDLOG_INFO("==========================================");
167+
SPDLOG_DEBUG("==========================================");
168168

169169
return true;
170170
}

src/renderers/tile_based_renderer.cpp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -132,19 +132,19 @@ bool TileBasedRenderer::Render(const Model &model, const Shader &shader_in,
132132
.count() /
133133
1000.0;
134134

135-
SPDLOG_INFO("=== TILE-BASED RENDERING PERFORMANCE ===");
135+
SPDLOG_DEBUG("=== TILE-BASED RENDERING PERFORMANCE ===");
136136
double sum_ms = vertex_ms + (total_ms - vertex_ms);
137-
SPDLOG_INFO("Vertex Shader: {:8.3f} ms ({:5.1f}%)", vertex_ms,
137+
SPDLOG_DEBUG("Vertex Shader: {:8.3f} ms ({:5.1f}%)", vertex_ms,
138138
vertex_ms / sum_ms * 100);
139-
SPDLOG_INFO("Setup: {:8.3f} ms", setup_ms);
140-
SPDLOG_INFO("Binning: {:8.3f} ms", binning_ms);
141-
SPDLOG_INFO("Buffer Alloc: {:8.3f} ms", buffer_alloc_ms);
142-
SPDLOG_INFO("Rasterization: {:8.3f} ms", raster_ms);
143-
SPDLOG_INFO("Copy: {:8.3f} ms", present_ms);
144-
SPDLOG_INFO("Total: {:8.3f} ms",
139+
SPDLOG_DEBUG("Setup: {:8.3f} ms", setup_ms);
140+
SPDLOG_DEBUG("Binning: {:8.3f} ms", binning_ms);
141+
SPDLOG_DEBUG("Buffer Alloc: {:8.3f} ms", buffer_alloc_ms);
142+
SPDLOG_DEBUG("Rasterization: {:8.3f} ms", raster_ms);
143+
SPDLOG_DEBUG("Copy: {:8.3f} ms", present_ms);
144+
SPDLOG_DEBUG("Total: {:8.3f} ms",
145145
vertex_ms + (setup_ms + binning_ms + buffer_alloc_ms + raster_ms +
146-
present_ms));
147-
SPDLOG_INFO("==========================================");
146+
present_ms));
147+
SPDLOG_DEBUG("==========================================");
148148

149149
return true;
150150
}
@@ -155,9 +155,9 @@ void TileBasedRenderer::TriangleTileBinning(
155155
std::vector<std::vector<TileTriangleRef>> &tile_triangles) {
156156
const size_t total_triangles = model.GetFaces().size();
157157

158-
SPDLOG_INFO("Starting triangle-tile binning (SoA) for {} triangles",
158+
SPDLOG_DEBUG("Starting triangle-tile binning (SoA) for {} triangles",
159159
total_triangles);
160-
SPDLOG_INFO("Screen dimensions: {}x{}, Tile size: {}, Tiles: {}x{}", width_,
160+
SPDLOG_DEBUG("Screen dimensions: {}x{}, Tile size: {}, Tiles: {}x{}", width_,
161161
height_, grid.tile_size, grid.tiles_x, grid.tiles_y);
162162

163163
std::vector<size_t> tile_counts(grid.tiles_x * grid.tiles_y, 0);
@@ -186,9 +186,9 @@ void TileBasedRenderer::TriangleTileBinning(
186186
total_triangle_refs += tile.size();
187187
if (!tile.empty()) non_empty_tiles++;
188188
}
189-
SPDLOG_INFO(" (SoA) Total triangle references: {}", total_triangle_refs);
190-
SPDLOG_INFO(" (SoA) Non-empty tiles: {}", non_empty_tiles);
191-
SPDLOG_INFO(" (SoA) Average triangles per tile: {:.2f}",
189+
SPDLOG_DEBUG(" (SoA) Total triangle references: {}", total_triangle_refs);
190+
SPDLOG_DEBUG(" (SoA) Non-empty tiles: {}", non_empty_tiles);
191+
SPDLOG_DEBUG(" (SoA) Average triangles per tile: {:.2f}",
192192
total_triangle_refs > 0
193193
? float(total_triangle_refs) / tile_triangles.size()
194194
: 0.0f);

0 commit comments

Comments
 (0)