summaryrefslogtreecommitdiffstats
path: root/servers/rendering/rendering_server_default.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2021-07-03 17:04:07 +0200
committerGitHub <noreply@github.com>2021-07-03 17:04:07 +0200
commit4cb6986cdb0b2df2d6a505781534c060a901e725 (patch)
tree9e36c28da5555ca666dbfb00ca7984b16eb7449b /servers/rendering/rendering_server_default.cpp
parenta525e7774006a7439779c7b1bd64ed0f2ccf6385 (diff)
parent6c55d2aad22cd5fc3a7f1499c4cb85779613a394 (diff)
downloadredot-engine-4cb6986cdb0b2df2d6a505781534c060a901e725.tar.gz
Merge pull request #50096 from reduz/fix-render-info
Fix Render Info
Diffstat (limited to 'servers/rendering/rendering_server_default.cpp')
-rw-r--r--servers/rendering/rendering_server_default.cpp13
1 files changed, 11 insertions, 2 deletions
diff --git a/servers/rendering/rendering_server_default.cpp b/servers/rendering/rendering_server_default.cpp
index aad6163a16..e3ebebca86 100644
--- a/servers/rendering/rendering_server_default.cpp
+++ b/servers/rendering/rendering_server_default.cpp
@@ -189,6 +189,8 @@ void RenderingServerDefault::_draw(bool p_swap_buffers, double frame_step) {
print_frame_profile_frame_count = 0;
}
}
+
+ RSG::storage->update_memory_info();
}
float RenderingServerDefault::get_frame_setup_time_cpu() const {
@@ -239,8 +241,15 @@ void RenderingServerDefault::finish() {
/* STATUS INFORMATION */
-uint64_t RenderingServerDefault::get_render_info(RenderInfo p_info) {
- return RSG::storage->get_render_info(p_info);
+uint64_t RenderingServerDefault::get_rendering_info(RenderingInfo p_info) {
+ if (p_info == RENDERING_INFO_TOTAL_OBJECTS_IN_FRAME) {
+ return RSG::viewport->get_total_objects_drawn();
+ } else if (p_info == RENDERING_INFO_TOTAL_PRIMITIVES_IN_FRAME) {
+ return RSG::viewport->get_total_vertices_drawn();
+ } else if (p_info == RENDERING_INFO_TOTAL_DRAW_CALLS_IN_FRAME) {
+ return RSG::viewport->get_total_draw_calls_used();
+ }
+ return RSG::storage->get_rendering_info(p_info);
}
String RenderingServerDefault::get_video_adapter_name() const {