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

Merge pull request #21467 from elasota/fix-3d-textures

Browse Source 
Fix some 3D texture issues
This commit is contained in:
Rémi Verschelde 2018-08-27 09:51:05 +02:00 committed by GitHub
commit 0ba84b3f23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 44 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/gles2/rasterizer_storage_gles2.cpp
View File

@ -365,6 +365,7 @@ void RasterizerStorageGLES2::texture_allocate(RID p_texture, int p_width, int p_
ERR_FAIL_COND(!texture); ERR_FAIL_COND(!texture);
texture->width = p_width; texture->width = p_width;
texture->height = p_height; texture->height = p_height;
texture->depth = 0;
texture->format = p_format; texture->format = p_format;
texture->flags = p_flags; texture->flags = p_flags;
texture->stored_cube_sides = 0; texture->stored_cube_sides = 0;
@ -384,6 +385,7 @@ void RasterizerStorageGLES2::texture_allocate(RID p_texture, int p_width, int p_
} break; } break;
case VS::TEXTURE_TYPE_3D: { case VS::TEXTURE_TYPE_3D: {
texture->images.resize(p_depth_3d); texture->images.resize(p_depth_3d);
texture->depth = p_depth_3d;
} break; } break;
default: { default: {
ERR_PRINT("Unknown texture type!"); ERR_PRINT("Unknown texture type!");
@ -396,6 +398,7 @@ void RasterizerStorageGLES2::texture_allocate(RID p_texture, int p_width, int p_
texture->alloc_width = texture->width; texture->alloc_width = texture->width;
texture->alloc_height = texture->height; texture->alloc_height = texture->height;
texture->alloc_depth = texture->depth;
texture->gl_format_cache = format; texture->gl_format_cache = format;
texture->gl_type_cache = type; texture->gl_type_cache = type;
@ -591,7 +594,9 @@ Ref<Image> RasterizerStorageGLES2::texture_get_data(RID p_texture, int p_layer)
PoolVector<uint8_t> data; PoolVector<uint8_t> data;
int data_size = Image::get_image_data_size(texture->alloc_width, texture->alloc_height, real_format, texture->mipmaps > 1 ? -1 : 0); int alloc_depth = MAX(texture->alloc_depth, 1);
int data_size = Image::get_image_data_size(texture->alloc_width, texture->alloc_height, real_format, texture->mipmaps > 1 ? -1 : 0) * alloc_depth;
data.resize(data_size * 2); //add some memory at the end, just in case for buggy drivers data.resize(data_size * 2); //add some memory at the end, just in case for buggy drivers
PoolVector<uint8_t>::Write wb = data.write(); PoolVector<uint8_t>::Write wb = data.write();
@ -620,7 +625,7 @@ Ref<Image> RasterizerStorageGLES2::texture_get_data(RID p_texture, int p_layer)
wb = PoolVector<uint8_t>::Write(); wb = PoolVector<uint8_t>::Write();
data.resize(data_size); data.resize(data_size / alloc_depth);
Image *img = memnew(Image(texture->alloc_width, texture->alloc_height, texture->mipmaps > 1 ? true : false, real_format, data)); Image *img = memnew(Image(texture->alloc_width, texture->alloc_height, texture->mipmaps > 1 ? true : false, real_format, data));
@ -780,7 +785,7 @@ void RasterizerStorageGLES2::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);
} }
@ -3662,6 +3667,8 @@ void RasterizerStorageGLES2::_render_target_allocate(RenderTarget *rt) {
texture->alloc_width = rt->width; texture->alloc_width = rt->width;
texture->height = rt->height; texture->height = rt->height;
texture->alloc_height = rt->height; texture->alloc_height = rt->height;
texture->depth = 0;
texture->alloc_depth = 0;
texture->active = true; texture->active = true;
texture_set_flags(rt->texture, texture->flags); texture_set_flags(rt->texture, texture->flags);
@ -3709,6 +3716,8 @@ void RasterizerStorageGLES2::_render_target_clear(RenderTarget *rt) {
Texture *tex = texture_owner.get(rt->texture); Texture *tex = texture_owner.get(rt->texture);
tex->alloc_height = 0; tex->alloc_height = 0;
tex->alloc_width = 0; tex->alloc_width = 0;
tex->alloc_depth = 0;
tex->depth = 0;
tex->width = 0; tex->width = 0;
tex->height = 0; tex->height = 0;
tex->active = false; tex->active = false;
@ -3732,8 +3741,10 @@ RID RasterizerStorageGLES2::render_target_create() {
t->flags = 0; t->flags = 0;
t->width = 0; t->width = 0;
t->height = 0; t->height = 0;
t->alloc_height = 0; t->depth = 0;
t->alloc_width = 0; t->alloc_width = 0;
t->alloc_height = 0;
t->alloc_depth = 0;
t->format = Image::FORMAT_R8; t->format = Image::FORMAT_R8;
t->target = GL_TEXTURE_2D; t->target = GL_TEXTURE_2D;
t->gl_format_cache = 0; t->gl_format_cache = 0;

4
drivers/gles2/rasterizer_storage_gles2.h
View File

@ -232,7 +232,7 @@ public:
String path; String path;
uint32_t flags; uint32_t flags;
int width, height, depth; int width, height, depth;
int alloc_width, alloc_height; int alloc_width, alloc_height, alloc_depth;
Image::Format format; Image::Format format;
VS::TextureType type; VS::TextureType type;
@ -275,8 +275,10 @@ public:
flags = 0; flags = 0;
width = 0; width = 0;
height = 0; height = 0;
depth = 0;
alloc_width = 0; alloc_width = 0;
alloc_height = 0; alloc_height = 0;
alloc_depth = 0;
format = Image::FORMAT_L8; format = Image::FORMAT_L8;
target = 0; target = 0;

23
drivers/gles3/rasterizer_storage_gles3.cpp
View File

@ -667,7 +667,7 @@ 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 != 1 && height != 1) {
glTexImage3D(texture->target, 0, internal_format, width, height, depth, 0, format, type, NULL); glTexImage3D(texture->target, mipmaps, internal_format, width, height, depth, 0, format, type, NULL);
width = MAX(1, width / 2); width = MAX(1, width / 2);
height = MAX(1, height / 2); height = MAX(1, height / 2);
@ -1029,7 +1029,11 @@ Ref<Image> RasterizerStorageGLES3::texture_get_data(RID p_texture, int p_layer)
PoolVector<uint8_t> data; PoolVector<uint8_t> data;
int data_size = Image::get_image_data_size(texture->alloc_width, texture->alloc_height, real_format, texture->mipmaps > 1 ? -1 : 0); int alloc_depth = MAX(texture->alloc_depth, 1);
ERR_FAIL_COND_V(p_layer < 0 || p_layer >= alloc_depth, Ref<Image>());
int data_size = Image::get_image_data_size(texture->alloc_width, texture->alloc_height, real_format, texture->mipmaps > 1 ? -1 : 0) * alloc_depth;
data.resize(data_size * 2); //add some memory at the end, just in case for buggy drivers data.resize(data_size * 2); //add some memory at the end, just in case for buggy drivers
PoolVector<uint8_t>::Write wb = data.write(); PoolVector<uint8_t>::Write wb = data.write();
@ -1085,9 +1089,13 @@ Ref<Image> RasterizerStorageGLES3::texture_get_data(RID p_texture, int p_layer)
img_format = real_format; img_format = real_format;
} }
wb = PoolVector<uint8_t>::Write(); int slice_size = data_size / alloc_depth;
data.resize(data_size); if (p_layer) {
memcpy(&wb[0], &wb[slice_size * p_layer], slice_size);
}
data.resize(slice_size);
Image *img = memnew(Image(texture->alloc_width, texture->alloc_height, texture->mipmaps > 1 ? true : false, img_format, data)); Image *img = memnew(Image(texture->alloc_width, texture->alloc_height, texture->mipmaps > 1 ? true : false, img_format, data));
@ -1275,7 +1283,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);
} }
@ -1442,6 +1450,7 @@ RID RasterizerStorageGLES3::texture_create_radiance_cubemap(RID p_source, int p_
ctex->height = p_resolution; ctex->height = p_resolution;
ctex->alloc_width = p_resolution; ctex->alloc_width = p_resolution;
ctex->alloc_height = p_resolution; ctex->alloc_height = p_resolution;
ctex->alloc_depth = 0;
ctex->format = use_float ? Image::FORMAT_RGBAH : Image::FORMAT_RGBA8; ctex->format = use_float ? Image::FORMAT_RGBAH : Image::FORMAT_RGBA8;
ctex->target = GL_TEXTURE_CUBE_MAP; ctex->target = GL_TEXTURE_CUBE_MAP;
ctex->gl_format_cache = format; ctex->gl_format_cache = format;
@ -6464,6 +6473,7 @@ void RasterizerStorageGLES3::_render_target_clear(RenderTarget *rt) {
Texture *tex = texture_owner.get(rt->texture); Texture *tex = texture_owner.get(rt->texture);
tex->alloc_height = 0; tex->alloc_height = 0;
tex->alloc_width = 0; tex->alloc_width = 0;
tex->alloc_depth = 0;
tex->width = 0; tex->width = 0;
tex->height = 0; tex->height = 0;
tex->active = false; tex->active = false;
@ -6577,6 +6587,7 @@ void RasterizerStorageGLES3::_render_target_allocate(RenderTarget *rt) {
tex->height = rt->height; tex->height = rt->height;
tex->alloc_height = rt->height; tex->alloc_height = rt->height;
tex->active = true; tex->active = true;
tex->alloc_depth = 0;
texture_set_flags(rt->texture, tex->flags); texture_set_flags(rt->texture, tex->flags);
} }
@ -6865,8 +6876,10 @@ RID RasterizerStorageGLES3::render_target_create() {
t->flags = 0; t->flags = 0;
t->width = 0; t->width = 0;
t->height = 0; t->height = 0;
t->depth = 0;
t->alloc_height = 0; t->alloc_height = 0;
t->alloc_width = 0; t->alloc_width = 0;
t->alloc_depth = 0;
t->format = Image::FORMAT_R8; t->format = Image::FORMAT_R8;
t->target = GL_TEXTURE_2D; t->target = GL_TEXTURE_2D;
t->gl_format_cache = 0; t->gl_format_cache = 0;

8
drivers/gles3/rasterizer_storage_gles3.h
View File

@ -294,7 +294,13 @@ public:
stored_cube_sides = 0; stored_cube_sides = 0;
ignore_mipmaps = false; ignore_mipmaps = false;
render_target = NULL; render_target = NULL;
flags = width = height = 0; flags = 0;
width = 0;
height = 0;
depth = 0;
alloc_width = 0;
alloc_height = 0;
alloc_depth = 0;
tex_id = 0; tex_id = 0;
data_size = 0; data_size = 0;
format = Image::FORMAT_L8; format = Image::FORMAT_L8;

2
scene/resources/texture.cpp
View File

@ -2051,8 +2051,8 @@ void TextureLayered::create(uint32_t p_width, uint32_t p_height, uint32_t p_dept
width = p_width; width = p_width;
height = p_height; height = p_height;
depth = p_depth; depth = p_depth;
flags = p_flags; flags = p_flags;
format = p_format;
} }
void TextureLayered::set_layer_data(const Ref<Image> &p_image, int p_layer) { void TextureLayered::set_layer_data(const Ref<Image> &p_image, int p_layer) {