diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-05-13 17:20:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-13 17:20:42 +0200 |
| commit | 868ee3ea10c4101aa941fcf08c3da13c3394df15 (patch) | |
| tree | 98674b6078452d0d9bfe3dba4585d169ad4f12a0 /drivers | |
| parent | 8667e4abf7d7087f384751447e94a585be400607 (diff) | |
| parent | e34eb5c26caf4a0a68f8c84f0e02893e4be2eeb6 (diff) | |
Merge pull request #28761 from aqnuep/texture_resource_reload_fix
Fix texture resource reload bug
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gles2/rasterizer_storage_gles2.cpp | 5 | ||||
| -rw-r--r-- | drivers/gles3/rasterizer_storage_gles3.cpp | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/drivers/gles2/rasterizer_storage_gles2.cpp b/drivers/gles2/rasterizer_storage_gles2.cpp index 13fdd1db73..3f78588940 100644 --- a/drivers/gles2/rasterizer_storage_gles2.cpp +++ b/drivers/gles2/rasterizer_storage_gles2.cpp @@ -774,10 +774,7 @@ Ref<Image> RasterizerStorageGLES2::texture_get_data(RID p_texture, int p_layer) for (int i = 0; i < texture->mipmaps; i++) { - int ofs = 0; - if (i > 0) { - ofs = Image::get_image_data_size(texture->alloc_width, texture->alloc_height, real_format, i - 1); - } + int ofs = Image::get_image_mipmap_offset(texture->alloc_width, texture->alloc_height, real_format, i); if (texture->compressed) { glPixelStorei(GL_PACK_ALIGNMENT, 4); diff --git a/drivers/gles3/rasterizer_storage_gles3.cpp b/drivers/gles3/rasterizer_storage_gles3.cpp index 95d4bec611..661be28e6b 100644 --- a/drivers/gles3/rasterizer_storage_gles3.cpp +++ b/drivers/gles3/rasterizer_storage_gles3.cpp @@ -1210,10 +1210,7 @@ Ref<Image> RasterizerStorageGLES3::texture_get_data(RID p_texture, int p_layer) for (int i = 0; i < texture->mipmaps; i++) { - int ofs = 0; - if (i > 0) { - ofs = Image::get_image_data_size(texture->alloc_width, texture->alloc_height, real_format, i - 1); - } + int ofs = Image::get_image_mipmap_offset(texture->alloc_width, texture->alloc_height, real_format, i); if (texture->compressed) { |