godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Fix inability to set TextureLayeredRD as TEXTURE_TYPE_CUBE or TEXTURE_TYPE_CUBE_ARRAY

This commit is contained in:
jadeharley2 2024-11-11 15:31:43 +03:00
parent 0f5f3bc954
commit a4d1d36c85
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scene/resources/texture_rd.cpp
View File

@ -197,7 +197,7 @@ void TextureLayeredRD::_set_texture_rd_rid(RID p_texture_rd_rid) {
RS::TextureLayeredType rs_layer_type; RS::TextureLayeredType rs_layer_type;
RD::TextureFormat tf = RD::get_singleton()->texture_get_format(p_texture_rd_rid); RD::TextureFormat tf = RD::get_singleton()->texture_get_format(p_texture_rd_rid);
ERR_FAIL_COND(tf.texture_type != RD::TEXTURE_TYPE_2D_ARRAY); ERR_FAIL_COND(tf.texture_type != RD::TEXTURE_TYPE_2D_ARRAY && tf.texture_type != RD::TEXTURE_TYPE_CUBE && tf.texture_type != RD::TEXTURE_TYPE_CUBE_ARRAY);
ERR_FAIL_COND(tf.depth > 1); ERR_FAIL_COND(tf.depth > 1);
switch (layer_type) { switch (layer_type) {
case LAYERED_TYPE_2D_ARRAY: { case LAYERED_TYPE_2D_ARRAY: {

4
servers/rendering/renderer_rd/storage_rd/texture_storage.cpp
View File

@ -1666,7 +1666,9 @@ void TextureStorage::texture_rd_initialize(RID p_texture, const RID &p_rd_textur
ERR_FAIL_COND(tf.array_layers != 1); ERR_FAIL_COND(tf.array_layers != 1);
texture.type = TextureStorage::TYPE_2D; texture.type = TextureStorage::TYPE_2D;
} break; } break;
case RD::TEXTURE_TYPE_2D_ARRAY: { case RD::TEXTURE_TYPE_2D_ARRAY:
case RD::TEXTURE_TYPE_CUBE:
case RD::TEXTURE_TYPE_CUBE_ARRAY: {
// RenderingDevice doesn't distinguish between Array textures and Cube textures // RenderingDevice doesn't distinguish between Array textures and Cube textures
// this condition covers TextureArrays, TextureCube, and TextureCubeArray. // this condition covers TextureArrays, TextureCube, and TextureCubeArray.
ERR_FAIL_COND(tf.array_layers == 1); ERR_FAIL_COND(tf.array_layers == 1);