diff options
| author | bunnei <bunneidev@gmail.com> | 2018-04-18 14:46:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-18 14:46:10 -0400 |
| commit | d3f9ea90e78dce585f23c71c969990439937b427 (patch) | |
| tree | 618163c00bf621be9b7a44535493ceeaabd6257f /src/video_core/engines | |
| parent | c93ea96366da6907d8c5d0a4f94c9c4ed7dd39ca (diff) | |
| parent | 48d4efbd696d1dbd5330d74e69a52f8e508d279d (diff) | |
Merge pull request #349 from Subv/texturing
GPU: Support non-tiled textures and configurable block height.
Diffstat (limited to 'src/video_core/engines')
| -rw-r--r-- | src/video_core/engines/maxwell_3d.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/video_core/engines/maxwell_3d.cpp b/src/video_core/engines/maxwell_3d.cpp index a2f162602..2a3ff234a 100644 --- a/src/video_core/engines/maxwell_3d.cpp +++ b/src/video_core/engines/maxwell_3d.cpp @@ -218,8 +218,9 @@ Texture::TICEntry Maxwell3D::GetTICEntry(u32 tic_index) const { Texture::TICEntry tic_entry; Memory::ReadBlock(tic_address_cpu, &tic_entry, sizeof(Texture::TICEntry)); - ASSERT_MSG(tic_entry.header_version == Texture::TICHeaderVersion::BlockLinear, - "TIC versions other than BlockLinear are unimplemented"); + ASSERT_MSG(tic_entry.header_version == Texture::TICHeaderVersion::BlockLinear || + tic_entry.header_version == Texture::TICHeaderVersion::Pitch, + "TIC versions other than BlockLinear or Pitch are unimplemented"); ASSERT_MSG((tic_entry.texture_type == Texture::TextureType::Texture2D) || (tic_entry.texture_type == Texture::TextureType::Texture2DNoMipmap), |