Merge pull request #46817 from Ev1lbl0w/bugfix-negative_vram_3.2
Fix negative VRAM values
This commit is contained in:
commit
64a9e86c5c
12 changed files with 12 additions and 12 deletions
|
@ -1021,7 +1021,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);
|
||||||
|
|
|
@ -763,7 +763,7 @@ public:
|
||||||
void render_info_end_capture() {}
|
void render_info_end_capture() {}
|
||||||
int get_captured_render_info(VS::RenderInfo p_info) { return 0; }
|
int get_captured_render_info(VS::RenderInfo p_info) { return 0; }
|
||||||
|
|
||||||
int get_render_info(VS::RenderInfo p_info) { return 0; }
|
uint64_t get_render_info(VS::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(); }
|
||||||
|
|
||||||
|
|
|
@ -5946,7 +5946,7 @@ int RasterizerStorageGLES2::get_captured_render_info(VS::RenderInfo p_info) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int RasterizerStorageGLES2::get_render_info(VS::RenderInfo p_info) {
|
uint64_t RasterizerStorageGLES2::get_render_info(VS::RenderInfo p_info) {
|
||||||
switch (p_info) {
|
switch (p_info) {
|
||||||
case VS::INFO_OBJECTS_IN_FRAME:
|
case VS::INFO_OBJECTS_IN_FRAME:
|
||||||
return info.render_final.object_count;
|
return info.render_final.object_count;
|
||||||
|
|
|
@ -1345,7 +1345,7 @@ public:
|
||||||
virtual void render_info_end_capture();
|
virtual void render_info_end_capture();
|
||||||
virtual int get_captured_render_info(VS::RenderInfo p_info);
|
virtual int get_captured_render_info(VS::RenderInfo p_info);
|
||||||
|
|
||||||
virtual int get_render_info(VS::RenderInfo p_info);
|
virtual uint64_t get_render_info(VS::RenderInfo p_info);
|
||||||
virtual String get_video_adapter_name() const;
|
virtual String get_video_adapter_name() const;
|
||||||
virtual String get_video_adapter_vendor() const;
|
virtual String get_video_adapter_vendor() const;
|
||||||
|
|
||||||
|
|
|
@ -8294,7 +8294,7 @@ int RasterizerStorageGLES3::get_captured_render_info(VS::RenderInfo p_info) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int RasterizerStorageGLES3::get_render_info(VS::RenderInfo p_info) {
|
uint64_t RasterizerStorageGLES3::get_render_info(VS::RenderInfo p_info) {
|
||||||
|
|
||||||
switch (p_info) {
|
switch (p_info) {
|
||||||
case VS::INFO_OBJECTS_IN_FRAME:
|
case VS::INFO_OBJECTS_IN_FRAME:
|
||||||
|
|
|
@ -1507,7 +1507,7 @@ public:
|
||||||
virtual void render_info_end_capture();
|
virtual void render_info_end_capture();
|
||||||
virtual int get_captured_render_info(VS::RenderInfo p_info);
|
virtual int get_captured_render_info(VS::RenderInfo p_info);
|
||||||
|
|
||||||
virtual int get_render_info(VS::RenderInfo p_info);
|
virtual uint64_t get_render_info(VS::RenderInfo p_info);
|
||||||
virtual String get_video_adapter_name() const;
|
virtual String get_video_adapter_name() const;
|
||||||
virtual String get_video_adapter_vendor() const;
|
virtual String get_video_adapter_vendor() const;
|
||||||
|
|
||||||
|
|
|
@ -717,7 +717,7 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da
|
||||||
vmem_tree->clear();
|
vmem_tree->clear();
|
||||||
TreeItem *root = vmem_tree->create_item();
|
TreeItem *root = vmem_tree->create_item();
|
||||||
|
|
||||||
int total = 0;
|
uint64_t total = 0;
|
||||||
|
|
||||||
for (int i = 0; i < p_data.size(); i += 4) {
|
for (int i = 0; i < p_data.size(); i += 4) {
|
||||||
|
|
||||||
|
|
|
@ -601,7 +601,7 @@ public:
|
||||||
virtual void render_info_end_capture() = 0;
|
virtual void render_info_end_capture() = 0;
|
||||||
virtual int get_captured_render_info(VS::RenderInfo p_info) = 0;
|
virtual int get_captured_render_info(VS::RenderInfo p_info) = 0;
|
||||||
|
|
||||||
virtual int get_render_info(VS::RenderInfo p_info) = 0;
|
virtual uint64_t get_render_info(VS::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;
|
||||||
|
|
||||||
|
|
|
@ -148,7 +148,7 @@ void VisualServerRaster::finish() {
|
||||||
|
|
||||||
/* STATUS INFORMATION */
|
/* STATUS INFORMATION */
|
||||||
|
|
||||||
int VisualServerRaster::get_render_info(RenderInfo p_info) {
|
uint64_t VisualServerRaster::get_render_info(RenderInfo p_info) {
|
||||||
|
|
||||||
return VSG::storage->get_render_info(p_info);
|
return VSG::storage->get_render_info(p_info);
|
||||||
}
|
}
|
||||||
|
|
|
@ -685,7 +685,7 @@ public:
|
||||||
|
|
||||||
/* STATUS INFORMATION */
|
/* STATUS INFORMATION */
|
||||||
|
|
||||||
virtual int get_render_info(RenderInfo p_info);
|
virtual uint64_t get_render_info(RenderInfo p_info);
|
||||||
virtual String get_video_adapter_name() const;
|
virtual String get_video_adapter_name() const;
|
||||||
virtual String get_video_adapter_vendor() const;
|
virtual String get_video_adapter_vendor() const;
|
||||||
|
|
||||||
|
|
|
@ -605,7 +605,7 @@ public:
|
||||||
/* RENDER INFO */
|
/* RENDER INFO */
|
||||||
|
|
||||||
//this passes directly to avoid stalling
|
//this passes directly to avoid stalling
|
||||||
virtual int get_render_info(RenderInfo p_info) {
|
virtual uint64_t get_render_info(RenderInfo p_info) {
|
||||||
return visual_server->get_render_info(p_info);
|
return visual_server->get_render_info(p_info);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1038,7 +1038,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;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue