asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #46709 from Ev1lbl0w/bugfix-negative_vram

Browse source 
Fix negative VRAM values
This commit is contained in:
Rémi Verschelde 2021-03-05 23:53:25 +01:00 committed by GitHub
commit edbc8488a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/core_bind.cpp
View file

@ -566,7 +566,7 @@ struct _OSCoreBindImg {
void _OS::print_all_textures_by_size() { void _OS::print_all_textures_by_size() {
List<_OSCoreBindImg> imgs; List<_OSCoreBindImg> imgs;
int total = 0; uint64_t total = 0;
{ {
List<Ref<Resource>> rsrc; List<Ref<Resource>> rsrc;
ResourceCache::get_cached_resources(&rsrc); ResourceCache::get_cached_resources(&rsrc);

2
drivers/dummy/rasterizer_dummy.h
View file

@ -674,7 +674,7 @@ public:
void render_info_end_capture() override {} void render_info_end_capture() override {}
int get_captured_render_info(RS::RenderInfo p_info) override { return 0; } int get_captured_render_info(RS::RenderInfo p_info) override { return 0; }
int get_render_info(RS::RenderInfo p_info) override { return 0; } uint64_t get_render_info(RS::RenderInfo p_info) override { return 0; }
String get_video_adapter_name() const override { return String(); } String get_video_adapter_name() const override { return String(); }
String get_video_adapter_vendor() const override { return String(); } String get_video_adapter_vendor() const override { return String(); }

2
editor/debugger/script_editor_debugger.cpp
View file

@ -343,7 +343,7 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da
DebuggerMarshalls::ResourceUsage usage; DebuggerMarshalls::ResourceUsage usage;
usage.deserialize(p_data); usage.deserialize(p_data);
int total = 0; uint64_t total = 0;
for (List<DebuggerMarshalls::ResourceInfo>::Element *E = usage.infos.front(); E; E = E->next()) { for (List<DebuggerMarshalls::ResourceInfo>::Element *E = usage.infos.front(); E; E = E->next()) {
TreeItem *it = vmem_tree->create_item(root); TreeItem *it = vmem_tree->create_item(root);

2
servers/rendering/renderer_rd/renderer_storage_rd.h
View file

@ -2263,7 +2263,7 @@ public:
void render_info_end_capture() {} void render_info_end_capture() {}
int get_captured_render_info(RS::RenderInfo p_info) { return 0; } int get_captured_render_info(RS::RenderInfo p_info) { return 0; }
int get_render_info(RS::RenderInfo p_info) { return 0; } uint64_t get_render_info(RS::RenderInfo p_info) { return 0; }
String get_video_adapter_name() const { return String(); } String get_video_adapter_name() const { return String(); }
String get_video_adapter_vendor() const { return String(); } String get_video_adapter_vendor() const { return String(); }

2
servers/rendering/renderer_storage.h
View file

@ -608,7 +608,7 @@ public:
virtual void render_info_end_capture() = 0; virtual void render_info_end_capture() = 0;
virtual int get_captured_render_info(RS::RenderInfo p_info) = 0; virtual int get_captured_render_info(RS::RenderInfo p_info) = 0;
virtual int get_render_info(RS::RenderInfo p_info) = 0; virtual uint64_t get_render_info(RS::RenderInfo p_info) = 0;
virtual String get_video_adapter_name() const = 0; virtual String get_video_adapter_name() const = 0;
virtual String get_video_adapter_vendor() const = 0; virtual String get_video_adapter_vendor() const = 0;

2
servers/rendering/rendering_server_default.cpp
View file

@ -257,7 +257,7 @@ void RenderingServerDefault::finish() {
/* STATUS INFORMATION */ /* STATUS INFORMATION */
int RenderingServerDefault::get_render_info(RenderInfo p_info) { uint64_t RenderingServerDefault::get_render_info(RenderInfo p_info) {
return RSG::storage->get_render_info(p_info); return RSG::storage->get_render_info(p_info);
} }

2
servers/rendering/rendering_server_default.h
View file

@ -901,7 +901,7 @@ public:
/* STATUS INFORMATION */ /* STATUS INFORMATION */
virtual int get_render_info(RenderInfo p_info) override; virtual uint64_t get_render_info(RenderInfo p_info) override;
virtual String get_video_adapter_name() const override; virtual String get_video_adapter_name() const override;
virtual String get_video_adapter_vendor() const override; virtual String get_video_adapter_vendor() const override;

2
servers/rendering_server.h
View file

@ -1419,7 +1419,7 @@ public:
INFO_VERTEX_MEM_USED, INFO_VERTEX_MEM_USED,
}; };
virtual int get_render_info(RenderInfo p_info) = 0; virtual uint64_t get_render_info(RenderInfo p_info) = 0;
virtual String get_video_adapter_name() const = 0; virtual String get_video_adapter_name() const = 0;
virtual String get_video_adapter_vendor() const = 0; virtual String get_video_adapter_vendor() const = 0;