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

Fixed TextureArray and Texture3D issues

Browse source 
- Texture arrays and 3D textures weren't working previously due to an
  incorrect number of calls to glTexImage3D with incorrect level parameters.
  This change fixes that.
- Fixed the incorrect calculation of the byte size of layered textures.
- Added the layer count to the debugger info when viewing video memory usage.
This commit is contained in:
Daniel Rakos 2019-03-03 16:38:29 +01:00
parent 2f32a75d2e
commit 582f62c2b2
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/gles3/rasterizer_storage_gles3.cpp
View file

@ -702,14 +702,18 @@ void RasterizerStorageGLES3::texture_allocate(RID p_texture, int p_width, int p_
int mipmaps = 0; int mipmaps = 0;
while (width != 1 && height != 1) { while (width > 0 || height > 0 || (p_type == VS::TEXTURE_TYPE_3D && depth > 0)) {
glTexImage3D(texture->target, 0, internal_format, width, height, depth, 0, format, type, NULL); width = MAX(1, width);
height = MAX(1, height);
depth = MAX(1, depth);
width = MAX(1, width / 2); glTexImage3D(texture->target, mipmaps, internal_format, width, height, depth, 0, format, type, NULL);
height = MAX(1, height / 2);
width /= 2;
height /= 2;
if (p_type == VS::TEXTURE_TYPE_3D) { if (p_type == VS::TEXTURE_TYPE_3D) {
depth = MAX(1, depth / 2); depth /= 2;
} }
mipmaps++; mipmaps++;
@ -926,6 +930,9 @@ void RasterizerStorageGLES3::texture_set_data(RID p_texture, const Ref<Image> &p
h = MAX(1, h >> 1); h = MAX(1, h >> 1);
} }
// Handle array and 3D textures, as those set their data per layer.
tsize *= MAX(texture->alloc_depth, 1);
info.texture_mem -= texture->total_data_size; info.texture_mem -= texture->total_data_size;
texture->total_data_size = tsize; texture->total_data_size = tsize;
info.texture_mem += texture->total_data_size; info.texture_mem += texture->total_data_size;
@ -1496,7 +1503,7 @@ void RasterizerStorageGLES3::texture_debug_usage(List<VS::TextureInfo> *r_info)
tinfo.format = t->format; tinfo.format = t->format;
tinfo.width = t->alloc_width; tinfo.width = t->alloc_width;
tinfo.height = t->alloc_height; tinfo.height = t->alloc_height;
tinfo.depth = 0; tinfo.depth = t->alloc_depth;
tinfo.bytes = t->total_data_size; tinfo.bytes = t->total_data_size;
r_info->push_back(tinfo); r_info->push_back(tinfo);
} }

6
servers/register_server_types.cpp
View file

@ -73,7 +73,11 @@ static void _debugger_get_resource_usage(List<ScriptDebuggerRemote::ResourceUsag
usage.vram = E->get().bytes; usage.vram = E->get().bytes;
usage.id = E->get().texture; usage.id = E->get().texture;
usage.type = "Texture"; usage.type = "Texture";
usage.format = itos(E->get().width) + "x" + itos(E->get().height) + " " + Image::get_format_name(E->get().format); if (E->get().depth == 0) {
usage.format = itos(E->get().width) + "x" + itos(E->get().height) + " " + Image::get_format_name(E->get().format);
} else {
usage.format = itos(E->get().width) + "x" + itos(E->get().height) + "x" + itos(E->get().depth) + " " + Image::get_format_name(E->get().format);
}
r_usage->push_back(usage); r_usage->push_back(usage);
} }
} }