Skip to content

Commit e63c40e

Browse files
committed
Merge pull request godotengine#96113 from BlueCube3310/compat-array-fix
Compatibility: Fix crash when initializing certain compressed layered textures
2 parents 4a4c86c + e8b4568 commit e63c40e

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/gles3/storage/texture_storage.cpp

+2-4
Original file line numberDiff line numberDiff line change
@@ -1497,11 +1497,9 @@ void TextureStorage::_texture_set_data(RID p_texture, const Ref<Image> &p_image,
14971497
glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
14981498
if (texture->target == GL_TEXTURE_2D_ARRAY) {
14991499
if (p_initialize) {
1500-
glCompressedTexImage3D(GL_TEXTURE_2D_ARRAY, i, internal_format, w, h, texture->layers, 0,
1501-
size * texture->layers, &read[ofs]);
1502-
} else {
1503-
glCompressedTexSubImage3D(GL_TEXTURE_2D_ARRAY, i, 0, 0, p_layer, w, h, 1, internal_format, size, &read[ofs]);
1500+
glCompressedTexImage3D(GL_TEXTURE_2D_ARRAY, i, internal_format, w, h, texture->layers, 0, size * texture->layers, nullptr);
15041501
}
1502+
glCompressedTexSubImage3D(GL_TEXTURE_2D_ARRAY, i, 0, 0, p_layer, w, h, 1, internal_format, size, &read[ofs]);
15051503
} else {
15061504
glCompressedTexImage2D(blit_target, i, internal_format, w, h, 0, size, &read[ofs]);
15071505
}

0 commit comments

Comments
 (0)