Sara/viscosity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: updated godot version

Browse source
This commit is contained in:
Sara Gerretsen 2026-04-04 19:38:56 +02:00
parent 0c508b0831
commit 42b028dbb5
4694 changed files with 236470 additions and 401376 deletions
Download patch file Download diff file Expand all files Collapse all files

21
engine/servers/debugger/servers_debugger.cpp
View file

@ -30,15 +30,12 @@
#include "servers_debugger.h"
#include "core/config/engine.h"
#include "core/config/project_settings.h"
#include "core/debugger/engine_debugger.h"
#include "core/debugger/engine_profiler.h"
#include "core/io/resource_loader.h"
#include "core/object/script_language.h"
#include "core/os/os.h"
#include "servers/display/display_server.h"
#include "servers/rendering/rendering_server.h"
#define CHECK_SIZE(arr, expected, what) ERR_FAIL_COND_V_MSG((uint32_t)arr.size() < (uint32_t)(expected), false, String("Malformed ") + what + " message from script debugger, message too short. Expected size: " + itos(expected) + ", actual size: " + itos(arr.size()))
#define CHECK_END(arr, expected, what) ERR_FAIL_COND_V_MSG((uint32_t)arr.size() > (uint32_t)expected, false, String("Malformed ") + what + " message from script debugger, message too long. Expected size: " + itos(expected) + ", actual size: " + itos(arr.size()))
@ -173,7 +170,7 @@ bool ServersDebugger::VisualProfilerFrame::deserialize(const Array &p_arr) {
CHECK_SIZE(p_arr, size, "VisualProfilerFrame");
int idx = 2;
areas.resize(size / 3);
RenderingServerTypes::FrameProfileArea *w = areas.ptrw();
RS::FrameProfileArea *w = areas.ptrw();
for (int i = 0; i < size / 3; i++) {
w[i].name = p_arr[idx];
w[i].cpu_msec = p_arr[idx + 1];
@ -374,7 +371,7 @@ public:
void add(const Array &p_data) {}
void tick(double p_frame_time, double p_process_time, double p_physics_time, double p_physics_frame_time) {
Vector<RenderingServerTypes::FrameProfileArea> profile_areas = RS::get_singleton()->get_frame_profile();
Vector<RS::FrameProfileArea> profile_areas = RS::get_singleton()->get_frame_profile();
ServersDebugger::VisualProfilerFrame frame;
if (!profile_areas.size()) {
return;
@ -430,23 +427,23 @@ Error ServersDebugger::_capture(void *p_user, const String &p_cmd, const Array &
void ServersDebugger::_send_resource_usage() {
ServersDebugger::ResourceUsage usage;
List<RenderingServerTypes::TextureInfo> tinfo;
List<RS::TextureInfo> tinfo;
RS::get_singleton()->texture_debug_usage(&tinfo);
for (const RenderingServerTypes::TextureInfo &E : tinfo) {
for (const RS::TextureInfo &E : tinfo) {
ServersDebugger::ResourceInfo info;
info.path = E.path;
info.vram = E.bytes;
info.id = E.texture;
switch (E.type) {
case RSE::TextureType::TEXTURE_TYPE_2D:
case RS::TextureType::TEXTURE_TYPE_2D:
info.type = "Texture2D";
break;
case RSE::TextureType::TEXTURE_TYPE_3D:
case RS::TextureType::TEXTURE_TYPE_3D:
info.type = "Texture3D";
break;
case RSE::TextureType::TEXTURE_TYPE_LAYERED:
case RS::TextureType::TEXTURE_TYPE_LAYERED:
info.type = "TextureLayered";
break;
}
@ -464,10 +461,10 @@ void ServersDebugger::_send_resource_usage() {
usage.infos.push_back(info);
}
List<RenderingServerTypes::MeshInfo> mesh_info;
List<RS::MeshInfo> mesh_info;
RS::get_singleton()->mesh_debug_usage(&mesh_info);
for (const RenderingServerTypes::MeshInfo &E : mesh_info) {
for (const RS::MeshInfo &E : mesh_info) {
ServersDebugger::ResourceInfo info;
info.path = E.path;
// We use 64-bit integers to avoid overflow, if for whatever reason, the sum is bigger than 4GB.