diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-05-18 17:41:31 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-05-18 17:41:31 +0200 |
| commit | 7cd9f61d32c6b22c37ed3edd64ae819cb68c19ae (patch) | |
| tree | d880fd85f3a7cb49995ea7d5af0adcb6996756eb /drivers/gles3/storage | |
| parent | bd2300d77a6008167043f23fd91bcc562cde0a19 (diff) | |
| parent | 07c15ef3c8845f6772802b7ea5b728f50533d80f (diff) | |
| download | redot-engine-7cd9f61d32c6b22c37ed3edd64ae819cb68c19ae.tar.gz | |
Merge pull request #91853 from semensanyok/fix-compatibility-gles3-load-compressed-layered-tex-2dArray
Fix compatibility renderer load of compressed layered `GL_TEXTURE_2D_ARRAY`
Diffstat (limited to 'drivers/gles3/storage')
| -rw-r--r-- | drivers/gles3/storage/texture_storage.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/drivers/gles3/storage/texture_storage.cpp b/drivers/gles3/storage/texture_storage.cpp index 57ef951bdf..2dcf623995 100644 --- a/drivers/gles3/storage/texture_storage.cpp +++ b/drivers/gles3/storage/texture_storage.cpp @@ -1495,14 +1495,18 @@ void TextureStorage::_texture_set_data(RID p_texture, const Ref<Image> &p_image, for (int i = 0; i < mipmaps; i++) { int size, ofs; img->get_mipmap_offset_and_size(i, ofs, size); - if (compressed) { glPixelStorei(GL_UNPACK_ALIGNMENT, 4); - - int bw = w; - int bh = h; - - glCompressedTexImage2D(blit_target, i, internal_format, bw, bh, 0, size, &read[ofs]); + if (texture->target == GL_TEXTURE_2D_ARRAY) { + if (p_initialize) { + glCompressedTexImage3D(GL_TEXTURE_2D_ARRAY, i, internal_format, w, h, texture->layers, 0, + size * texture->layers, &read[ofs]); + } else { + glCompressedTexSubImage3D(GL_TEXTURE_2D_ARRAY, i, 0, 0, p_layer, w, h, 1, internal_format, size, &read[ofs]); + } + } else { + glCompressedTexImage2D(blit_target, i, internal_format, w, h, 0, size, &read[ofs]); + } } else { glPixelStorei(GL_UNPACK_ALIGNMENT, 1); if (texture->target == GL_TEXTURE_2D_ARRAY) { |