seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #104851 from Ivorforce/tracy

Browse Source 
Add `profiler` option to `SCons` builds, with support for `tracy` and `perfetto`.
This commit is contained in:
Thaddeus Crews
2025-11-12 11:24:15 -06:00
parent c9ef31360f c3747884da
commit 04bc282ae7
25 changed files with 375 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
platform/android/java_godot_lib_jni.cpp
View File

@ -49,6 +49,7 @@
#include "core/config/project_settings.h"
#include "core/input/input.h"
#include "core/os/main_loop.h"
#include "core/profiling/profiling.h"
#include "main/main.h"
#include "servers/rendering/rendering_server.h"
@ -151,6 +152,8 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_setVirtualKeyboardHei
}
JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_initialize(JNIEnv *env, jclass clazz, jobject p_godot_instance, jobject p_asset_manager, jobject p_godot_io, jobject p_net_utils, jobject p_directory_access_handler, jobject p_file_access_handler, jboolean p_use_apk_expansion) {
godot_init_profiler();
JavaVM *jvm;
env->GetJavaVM(&jvm);

3
platform/android/os_android.cpp
View File

@ -42,6 +42,7 @@
#include "core/extension/gdextension_manager.h"
#include "core/io/xml_parser.h"
#include "core/os/main_loop.h"
#include "core/profiling/profiling.h"
#include "drivers/unix/dir_access_unix.h"
#include "drivers/unix/file_access_unix.h"
#ifdef TOOLS_ENABLED
@ -364,6 +365,8 @@ void OS_Android::main_loop_begin() {
}
bool OS_Android::main_loop_iterate(bool *r_should_swap_buffers) {
GodotProfileFrameMark;
GodotProfileZone("OS_Android::main_loop_iterate");
if (!main_loop) {
return false;
}