[video_core] Improve texture rendering (#2830)

This fixes some edge cases and improves texture rendering, bringing it closer to specifications. This fixes many assertions that occur in some games, such as EOW.

Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/2830
Reviewed-by: Maufeat <sahyno1996@gmail.com>
Co-authored-by: MaranBr <maranbr@outlook.com>
Co-committed-by: MaranBr <maranbr@outlook.com>

src/video_core/texture_cache/image_info.cpp

@@ -54,48 +54,63 @@ ImageInfo::ImageInfo(const TICEntry& config) noexcept {
     TextureType tex_type = config.texture_type;
     if (tex_type == TextureType::Texture1D && (config.Depth() > 1 || config.BaseLayer() != 0)) {
         tex_type = TextureType::Texture1DArray;
+    } else if (tex_type == TextureType::Texture2D && (config.Depth() > 1 || config.BaseLayer() != 0)) {
+        tex_type = TextureType::Texture2DArray;
     }
     switch (tex_type) {
     case TextureType::Texture1D:
         ASSERT(config.BaseLayer() == 0);
+        ASSERT(config.Depth() == 1);
         type = ImageType::e1D;
         size.width = config.Width();
+        size.depth = 1;
         resources.layers = 1;
         break;
     case TextureType::Texture1DArray:
+        ASSERT(config.Depth() > 0);
+        ASSERT(config.BaseLayer() < config.Depth());
         type = ImageType::e1D;
         size.width = config.Width();
-            resources.layers = config.BaseLayer() + config.Depth();
+        size.depth = 1;
+        resources.layers = config.Depth() - config.BaseLayer();
         break;
     case TextureType::Texture2D:
     case TextureType::Texture2DNoMipmap:
+        ASSERT(config.BaseLayer() == 0);
         ASSERT(config.Depth() == 1);
         type = config.IsPitchLinear() ? ImageType::Linear : ImageType::e2D;
         rescaleable = !config.IsPitchLinear();
         size.width = config.Width();
         size.height = config.Height();
-            resources.layers = config.BaseLayer() + 1;
+        size.depth = 1;
+        resources.layers = 1;
         break;
     case TextureType::Texture2DArray:
+        ASSERT(config.Depth() > 0);
+        ASSERT(config.BaseLayer() < config.Depth());
         type = ImageType::e2D;
         rescaleable = true;
         size.width = config.Width();
         size.height = config.Height();
-            resources.layers = config.BaseLayer() + config.Depth();
+        size.depth = 1;
+        resources.layers = config.Depth() - config.BaseLayer();
         break;
     case TextureType::TextureCubemap:
         ASSERT(config.Depth() == 1);
         type = ImageType::e2D;
         size.width = config.Width();
         size.height = config.Height();
-            resources.layers = config.BaseLayer() + 6;
+        size.depth = 1;
+        resources.layers = 6;
         break;
     case TextureType::TextureCubeArray:
         UNIMPLEMENTED_IF(config.load_store_hint != 0);
+        ASSERT(config.Depth() > 0);
         type = ImageType::e2D;
         size.width = config.Width();
         size.height = config.Height();
-            resources.layers = config.BaseLayer() + config.Depth() * 6;
+        size.depth = 1;
+        resources.layers = (config.Depth() - config.BaseLayer()) * 6;
         break;
     case TextureType::Texture3D:
         ASSERT(config.BaseLayer() == 0);
@@ -108,6 +123,7 @@ ImageInfo::ImageInfo(const TICEntry& config) noexcept {
     case TextureType::Texture1DBuffer:
         type = ImageType::Buffer;
         size.width = config.Width();
+        size.depth = 1;
         resources.layers = 1;
         break;
     default:

src/video_core/texture_cache/image_view_info.cpp

@@ -43,29 +43,35 @@ ImageViewInfo::ImageViewInfo(const TICEntry& config, s32 base_layer) noexcept
     TextureType tex_type = config.texture_type;
     if (tex_type == TextureType::Texture1D && (config.Depth() > 1 || base_layer != 0)) {
         tex_type = TextureType::Texture1DArray;
+    } else if (tex_type == TextureType::Texture2D && (config.Depth() > 1 || base_layer != 0)) {
+        tex_type = TextureType::Texture2DArray;
     }
     switch (tex_type) {
     case TextureType::Texture1D:
         ASSERT(config.Height() == 1);
         ASSERT(config.Depth() == 1);
+        ASSERT(base_layer == 0);
         type = ImageViewType::e1D;
+        range.extent.layers = 1;
         break;
     case TextureType::Texture1DArray:
-                ASSERT(config.Height() == 1);
+        ASSERT(config.Depth() > 0);
+        ASSERT(static_cast<u32>(base_layer) < config.Depth());
         type = ImageViewType::e1DArray;
-                range.extent.layers = config.Depth();
+        range.extent.layers = config.Depth() - base_layer;
         break;
     case TextureType::Texture2D:
     case TextureType::Texture2DNoMipmap:
         ASSERT(config.Depth() == 1);
+        ASSERT(base_layer == 0);
         type = config.normalized_coords ? ImageViewType::e2D : ImageViewType::Rect;
+        range.extent.layers = 1;
         break;
     case TextureType::Texture2DArray:
+        ASSERT(config.Depth() > 0);
+        ASSERT(static_cast<u32>(base_layer) < config.Depth());
         type = ImageViewType::e2DArray;
-                range.extent.layers = config.Depth();
-                break;
-            case TextureType::Texture3D:
-                type = ImageViewType::e3D;
+        range.extent.layers = config.Depth() - base_layer;
         break;
     case TextureType::TextureCubemap:
         ASSERT(config.Depth() == 1);
@@ -73,11 +79,19 @@ ImageViewInfo::ImageViewInfo(const TICEntry& config, s32 base_layer) noexcept
         range.extent.layers = 6;
         break;
     case TextureType::TextureCubeArray:
+        ASSERT(config.Depth() > 0);
+        ASSERT(static_cast<u32>(base_layer) < config.Depth());
         type = ImageViewType::CubeArray;
-                range.extent.layers = config.Depth() * 6;
+        range.extent.layers = (config.Depth() - base_layer) * 6;
+        break;
+    case TextureType::Texture3D:
+        ASSERT(base_layer == 0);
+        type = ImageViewType::e3D;
+        range.extent.layers = 1;
         break;
     case TextureType::Texture1DBuffer:
         type = ImageViewType::Buffer;
+        range.extent.layers = 1;
         break;
     default:
         ASSERT_MSG(false, "Invalid texture_type={}", static_cast<int>(tex_type));