1 files changed, 33 insertions, 30 deletions

diff --git a/servers/rendering/rendering_server_raster.cpp b/servers/rendering/rendering_server_raster.cpp
index 7cc06527e4..d30160702b 100644
--- a/servers/rendering/rendering_server_raster.cpp
+++ b/servers/rendering/rendering_server_raster.cpp
@@ -45,7 +45,6 @@ int RenderingServerRaster::changes = 0;
 /* BLACK BARS */
 
 void RenderingServerRaster::black_bars_set_margins(int p_left, int p_top, int p_right, int p_bottom) {
-
 	black_margin[MARGIN_LEFT] = p_left;
 	black_margin[MARGIN_TOP] = p_top;
 	black_margin[MARGIN_RIGHT] = p_right;
@@ -53,7 +52,6 @@ void RenderingServerRaster::black_bars_set_margins(int p_left, int p_top, int p_
 }
 
 void RenderingServerRaster::black_bars_set_images(RID p_left, RID p_top, RID p_right, RID p_bottom) {
-
 	black_image[MARGIN_LEFT] = p_left;
 	black_image[MARGIN_TOP] = p_top;
 	black_image[MARGIN_RIGHT] = p_right;
@@ -61,30 +59,32 @@ void RenderingServerRaster::black_bars_set_images(RID p_left, RID p_top, RID p_r
 }
 
 void RenderingServerRaster::_draw_margins() {
-
 	RSG::canvas_render->draw_window_margins(black_margin, black_image);
 };
 
 /* FREE */
 
 void RenderingServerRaster::free(RID p_rid) {
-
-	if (RSG::storage->free(p_rid))
+	if (RSG::storage->free(p_rid)) {
 		return;
-	if (RSG::canvas->free(p_rid))
+	}
+	if (RSG::canvas->free(p_rid)) {
 		return;
-	if (RSG::viewport->free(p_rid))
+	}
+	if (RSG::viewport->free(p_rid)) {
 		return;
-	if (RSG::scene->free(p_rid))
+	}
+	if (RSG::scene->free(p_rid)) {
 		return;
-	if (RSG::scene_render->free(p_rid))
+	}
+	if (RSG::scene_render->free(p_rid)) {
 		return;
+	}
 }
 
 /* EVENT QUEUING */
 
 void RenderingServerRaster::request_frame_drawn_callback(Object *p_where, const StringName &p_method, const Variant &p_userdata) {
-
 	ERR_FAIL_NULL(p_where);
 	FrameDrawnCallbacks fdc;
 	fdc.object = p_where->get_instance_id();
@@ -95,7 +95,6 @@ void RenderingServerRaster::request_frame_drawn_callback(Object *p_where, const
 }
 
 void RenderingServerRaster::draw(bool p_swap_buffers, double frame_step) {
-
 	//needs to be done before changes is reset to 0, to not force the editor to redraw
 	RS::get_singleton()->emit_signal("frame_pre_draw");
 
@@ -117,7 +116,6 @@ void RenderingServerRaster::draw(bool p_swap_buffers, double frame_step) {
 	RSG::rasterizer->end_frame(p_swap_buffers);
 
 	while (frame_drawn_callbacks.front()) {
-
 		Object *obj = ObjectDB::get_instance(frame_drawn_callbacks.front()->get().object);
 		if (obj) {
 			Callable::CallError ce;
@@ -135,16 +133,27 @@ void RenderingServerRaster::draw(bool p_swap_buffers, double frame_step) {
 
 	if (RSG::storage->get_captured_timestamps_count()) {
 		Vector<FrameProfileArea> new_profile;
-		new_profile.resize(RSG::storage->get_captured_timestamps_count());
+		if (RSG::storage->capturing_timestamps) {
+			new_profile.resize(RSG::storage->get_captured_timestamps_count());
+		}
 
 		uint64_t base_cpu = RSG::storage->get_captured_timestamp_cpu_time(0);
 		uint64_t base_gpu = RSG::storage->get_captured_timestamp_gpu_time(0);
 		for (uint32_t i = 0; i < RSG::storage->get_captured_timestamps_count(); i++) {
-			uint64_t time_cpu = RSG::storage->get_captured_timestamp_cpu_time(i) - base_cpu;
-			uint64_t time_gpu = RSG::storage->get_captured_timestamp_gpu_time(i) - base_gpu;
-			new_profile.write[i].gpu_msec = float(time_gpu / 1000) / 1000.0;
-			new_profile.write[i].cpu_msec = float(time_cpu) / 1000.0;
-			new_profile.write[i].name = RSG::storage->get_captured_timestamp_name(i);
+			uint64_t time_cpu = RSG::storage->get_captured_timestamp_cpu_time(i);
+			uint64_t time_gpu = RSG::storage->get_captured_timestamp_gpu_time(i);
+
+			String name = RSG::storage->get_captured_timestamp_name(i);
+
+			if (name.begins_with("vp_")) {
+				RSG::viewport->handle_timestamp(name, time_cpu, time_gpu);
+			}
+
+			if (RSG::storage->capturing_timestamps) {
+				new_profile.write[i].gpu_msec = float((time_gpu - base_gpu) / 1000) / 1000.0;
+				new_profile.write[i].cpu_msec = float(time_cpu - base_cpu) / 1000.0;
+				new_profile.write[i].name = RSG::storage->get_captured_timestamp_name(i);
+			}
 		}
 
 		frame_profile = new_profile;
@@ -152,18 +161,19 @@ void RenderingServerRaster::draw(bool p_swap_buffers, double frame_step) {
 
 	frame_profile_frame = RSG::storage->get_captured_timestamps_frame();
 }
+
 void RenderingServerRaster::sync() {
 }
-bool RenderingServerRaster::has_changed() const {
 
+bool RenderingServerRaster::has_changed() const {
 	return changes > 0;
 }
-void RenderingServerRaster::init() {
 
+void RenderingServerRaster::init() {
 	RSG::rasterizer->initialize();
 }
-void RenderingServerRaster::finish() {
 
+void RenderingServerRaster::finish() {
 	if (test_cube.is_valid()) {
 		free(test_cube);
 	}
@@ -174,17 +184,14 @@ void RenderingServerRaster::finish() {
 /* STATUS INFORMATION */
 
 int RenderingServerRaster::get_render_info(RenderInfo p_info) {
-
 	return RSG::storage->get_render_info(p_info);
 }
 
 String RenderingServerRaster::get_video_adapter_name() const {
-
 	return RSG::storage->get_video_adapter_name();
 }
 
 String RenderingServerRaster::get_video_adapter_vendor() const {
-
 	return RSG::storage->get_video_adapter_vendor();
 }
 
@@ -203,16 +210,15 @@ Vector<RenderingServer::FrameProfileArea> RenderingServerRaster::get_frame_profi
 /* TESTING */
 
 void RenderingServerRaster::set_boot_image(const Ref<Image> &p_image, const Color &p_color, bool p_scale, bool p_use_filter) {
-
 	redraw_request();
 	RSG::rasterizer->set_boot_image(p_image, p_color, p_scale, p_use_filter);
 }
+
 void RenderingServerRaster::set_default_clear_color(const Color &p_color) {
 	RSG::viewport->set_default_clear_color(p_color);
 }
 
 bool RenderingServerRaster::has_feature(Features p_feature) const {
-
 	return false;
 }
 
@@ -224,12 +230,10 @@ RID RenderingServerRaster::get_test_cube() {
 }
 
 bool RenderingServerRaster::has_os_feature(const String &p_feature) const {
-
 	return RSG::storage->has_os_feature(p_feature);
 }
 
 void RenderingServerRaster::set_debug_generate_wireframes(bool p_generate) {
-
 	RSG::storage->set_debug_generate_wireframes(p_generate);
 }
 
@@ -244,8 +248,8 @@ bool RenderingServerRaster::is_low_end() const {
 	//return RSG::rasterizer->is_low_end();
 	return false;
 }
-RenderingServerRaster::RenderingServerRaster() {
 
+RenderingServerRaster::RenderingServerRaster() {
 	RSG::canvas = memnew(RenderingServerCanvas);
 	RSG::viewport = memnew(RenderingServerViewport);
 	RSG::scene = memnew(RenderingServerScene);
@@ -263,7 +267,6 @@ RenderingServerRaster::RenderingServerRaster() {
 }
 
 RenderingServerRaster::~RenderingServerRaster() {
-
 	memdelete(RSG::canvas);
 	memdelete(RSG::viewport);
 	memdelete(RSG::rasterizer);