diff options
| author |  liamwhite | 2023-09-18 09:31:05 -0400 |
|---|---|---|
| committer |  GitHub | 2023-09-18 09:31:05 -0400 |
| commit | 974380fe10cc4f10beaa87f96d0b050b06a6e9a8 (patch) | |
| tree | ac8e51295a9fbf7aea3c2a8f52cbdbb4314a704a | |
| parent | Merge pull request #11520 from Kelebek1/estimated_time (diff) | |
| parent | Needed to make this an extra case so it didnt also start asserting in BOTW. (diff) | |
| download | yuzu-974380fe10cc4f10beaa87f96d0b050b06a6e9a8.tar.gz yuzu-974380fe10cc4f10beaa87f96d0b050b06a6e9a8.tar.xz yuzu-974380fe10cc4f10beaa87f96d0b050b06a6e9a8.zip | |
Merge pull request #11258 from Squall-Leonhart/Z16_Assert_Fix
Fix a logged assert in the format lookup table for Z16
| -rw-r--r-- | src/video_core/texture_cache/format_lookup_table.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/video_core/texture_cache/format_lookup_table.cpp b/src/video_core/texture_cache/format_lookup_table.cpp index 11ced6c38..56307d030 100644 --- a/src/video_core/texture_cache/format_lookup_table.cpp +++ b/src/video_core/texture_cache/format_lookup_table.cpp | |||
| @@ -140,6 +140,8 @@ PixelFormat PixelFormatFromTextureInfo(TextureFormat format, ComponentType red, | |||
| 140 | return PixelFormat::D32_FLOAT; | 140 | return PixelFormat::D32_FLOAT; |
| 141 | case Hash(TextureFormat::Z16, UNORM): | 141 | case Hash(TextureFormat::Z16, UNORM): |
| 142 | return PixelFormat::D16_UNORM; | 142 | return PixelFormat::D16_UNORM; |
| 143 | case Hash(TextureFormat::Z16, UNORM, UINT, UINT, UINT, LINEAR): | ||
| 144 | return PixelFormat::D16_UNORM; | ||
| 143 | case Hash(TextureFormat::Z24S8, UINT, UNORM, UNORM, UNORM, LINEAR): | 145 | case Hash(TextureFormat::Z24S8, UINT, UNORM, UNORM, UNORM, LINEAR): |
| 144 | return PixelFormat::S8_UINT_D24_UNORM; | 146 | return PixelFormat::S8_UINT_D24_UNORM; |
| 145 | case Hash(TextureFormat::Z24S8, UINT, UNORM, UINT, UINT, LINEAR): | 147 | case Hash(TextureFormat::Z24S8, UINT, UNORM, UINT, UINT, LINEAR): |