Browse Source

Fix build (again)

pull/2830/head
MaranBr 5 months ago
committed by crueter
parent
commit
4ca4cbb32a
  1. 16
      src/video_core/texture_cache/image_view_info.cpp

16
src/video_core/texture_cache/image_view_info.cpp

@ -56,7 +56,7 @@ ImageViewInfo::ImageViewInfo(const TICEntry& config, s32 base_layer) noexcept
break; break;
case TextureType::Texture1DArray: case TextureType::Texture1DArray:
ASSERT(config.Depth() > 0); ASSERT(config.Depth() > 0);
ASSERT(base_layer < config.Depth());
ASSERT(static_cast<u32>(base_layer) < config.Depth());
type = ImageViewType::e1DArray; type = ImageViewType::e1DArray;
range.extent.layers = config.Depth() - base_layer; range.extent.layers = config.Depth() - base_layer;
break; break;
@ -69,15 +69,10 @@ ImageViewInfo::ImageViewInfo(const TICEntry& config, s32 base_layer) noexcept
break; break;
case TextureType::Texture2DArray: case TextureType::Texture2DArray:
ASSERT(config.Depth() > 0); ASSERT(config.Depth() > 0);
ASSERT(base_layer < config.Depth());
ASSERT(static_cast<u32>(base_layer) < config.Depth());
type = ImageViewType::e2DArray; type = ImageViewType::e2DArray;
range.extent.layers = config.Depth() - base_layer; range.extent.layers = config.Depth() - base_layer;
break; break;
case TextureType::Texture3D:
ASSERT(base_layer == 0);
type = ImageViewType::e3D;
range.extent.layers = config.Depth();
break;
case TextureType::TextureCubemap: case TextureType::TextureCubemap:
ASSERT(config.Depth() == 1); ASSERT(config.Depth() == 1);
ASSERT(base_layer == 0); ASSERT(base_layer == 0);
@ -86,10 +81,15 @@ ImageViewInfo::ImageViewInfo(const TICEntry& config, s32 base_layer) noexcept
break; break;
case TextureType::TextureCubeArray: case TextureType::TextureCubeArray:
ASSERT(config.Depth() > 0); ASSERT(config.Depth() > 0);
ASSERT(base_layer < config.Depth());
ASSERT(static_cast<u32>(base_layer) < config.Depth());
type = ImageViewType::CubeArray; type = ImageViewType::CubeArray;
range.extent.layers = (config.Depth() - base_layer) * 6; range.extent.layers = (config.Depth() - base_layer) * 6;
break; break;
case TextureType::Texture3D:
ASSERT(base_layer == 0);
type = ImageViewType::e3D;
range.extent.layers = 1;
break;
case TextureType::Texture1DBuffer: case TextureType::Texture1DBuffer:
type = ImageViewType::Buffer; type = ImageViewType::Buffer;
range.extent.layers = 1; range.extent.layers = 1;

Loading…
Cancel
Save