Browse Source

Fix a remaining assert

pull/2830/head
MaranBr 5 months ago
committed by crueter
parent
commit
6d06b59bdd
  1. 3
      src/video_core/texture_cache/image_info.cpp
  2. 3
      src/video_core/texture_cache/image_view_info.cpp

3
src/video_core/texture_cache/image_info.cpp

@ -56,8 +56,6 @@ ImageInfo::ImageInfo(const TICEntry& config) noexcept {
tex_type = TextureType::Texture1DArray; tex_type = TextureType::Texture1DArray;
} else if (tex_type == TextureType::Texture2D && (config.Depth() > 1 || config.BaseLayer() != 0)) { } else if (tex_type == TextureType::Texture2D && (config.Depth() > 1 || config.BaseLayer() != 0)) {
tex_type = TextureType::Texture2DArray; tex_type = TextureType::Texture2DArray;
} else if (tex_type == TextureType::TextureCubemap && (config.Depth() > 1 || config.BaseLayer() != 0)) {
tex_type = TextureType::TextureCubeArray;
} }
switch (tex_type) { switch (tex_type) {
case TextureType::Texture1D: case TextureType::Texture1D:
@ -99,7 +97,6 @@ ImageInfo::ImageInfo(const TICEntry& config) noexcept {
break; break;
case TextureType::TextureCubemap: case TextureType::TextureCubemap:
ASSERT(config.Depth() == 1); ASSERT(config.Depth() == 1);
ASSERT(config.BaseLayer() == 0);
type = ImageType::e2D; type = ImageType::e2D;
size.width = config.Width(); size.width = config.Width();
size.height = config.Height(); size.height = config.Height();

3
src/video_core/texture_cache/image_view_info.cpp

@ -45,8 +45,6 @@ ImageViewInfo::ImageViewInfo(const TICEntry& config, s32 base_layer) noexcept
tex_type = TextureType::Texture1DArray; tex_type = TextureType::Texture1DArray;
} else if (tex_type == TextureType::Texture2D && (config.Depth() > 1 || base_layer != 0)) { } else if (tex_type == TextureType::Texture2D && (config.Depth() > 1 || base_layer != 0)) {
tex_type = TextureType::Texture2DArray; tex_type = TextureType::Texture2DArray;
} else if (tex_type == TextureType::TextureCubemap && (config.Depth() > 1 || base_layer != 0)) {
tex_type = TextureType::TextureCubeArray;
} }
switch (tex_type) { switch (tex_type) {
case TextureType::Texture1D: case TextureType::Texture1D:
@ -77,7 +75,6 @@ ImageViewInfo::ImageViewInfo(const TICEntry& config, s32 base_layer) noexcept
break; break;
case TextureType::TextureCubemap: case TextureType::TextureCubemap:
ASSERT(config.Depth() == 1); ASSERT(config.Depth() == 1);
ASSERT(base_layer == 0);
type = ImageViewType::Cube; type = ImageViewType::Cube;
range.extent.layers = 6; range.extent.layers = 6;
break; break;

Loading…
Cancel
Save