From 9eed8ec2d68e82a2afd2c388b2077651636a830e Mon Sep 17 00:00:00 2001 From: MaranBr Date: Fri, 24 Oct 2025 14:54:40 -0400 Subject: [PATCH] Normalize TextureCubemap to TextureCubeArray when needed --- src/video_core/texture_cache/image_info.cpp | 2 ++ src/video_core/texture_cache/image_view_info.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/video_core/texture_cache/image_info.cpp b/src/video_core/texture_cache/image_info.cpp index d43ffa2eac..186afdc2f4 100644 --- a/src/video_core/texture_cache/image_info.cpp +++ b/src/video_core/texture_cache/image_info.cpp @@ -56,6 +56,8 @@ ImageInfo::ImageInfo(const TICEntry& config) noexcept { tex_type = TextureType::Texture1DArray; } else if (tex_type == TextureType::Texture2D && (config.Depth() > 1 || config.BaseLayer() != 0)) { tex_type = TextureType::Texture2DArray; + } else if (tex_type == TextureType::TextureCubemap && (config.Depth() > 1 || config.BaseLayer() != 0)) { + tex_type = TextureType::TextureCubeArray; } switch (tex_type) { case TextureType::Texture1D: diff --git a/src/video_core/texture_cache/image_view_info.cpp b/src/video_core/texture_cache/image_view_info.cpp index 5c681ab4fe..118b287ae2 100644 --- a/src/video_core/texture_cache/image_view_info.cpp +++ b/src/video_core/texture_cache/image_view_info.cpp @@ -45,6 +45,8 @@ ImageViewInfo::ImageViewInfo(const TICEntry& config, s32 base_layer) noexcept tex_type = TextureType::Texture1DArray; } else if (tex_type == TextureType::Texture2D && (config.Depth() > 1 || base_layer != 0)) { tex_type = TextureType::Texture2DArray; + } else if (tex_type == TextureType::TextureCubemap && (config.Depth() > 1 || base_layer != 0)) { + tex_type = TextureType::TextureCubeArray; } switch (tex_type) { case TextureType::Texture1D: