diff options
| author |  bunnei | 2020-02-21 22:08:57 -0500 |
|---|---|---|
| committer |  GitHub | 2020-02-21 22:08:57 -0500 |
| commit | 27d57e0c4a296f4011c4d8758137a3d259dd1141 (patch) | |
| tree | d45b569c0c060eed74fb28037b07e41cd4b5cd0e | |
| parent | Merge pull request #3433 from namkazt/patch-1 (diff) | |
| parent | shader/texture: Fix illegal 3D texture assert (diff) | |
| download | yuzu-27d57e0c4a296f4011c4d8758137a3d259dd1141.tar.gz yuzu-27d57e0c4a296f4011c4d8758137a3d259dd1141.tar.xz yuzu-27d57e0c4a296f4011c4d8758137a3d259dd1141.zip | |
Merge pull request #3442 from ReinUsesLisp/fix-3d-assert
shader/texture: Fix illegal 3D texture assert
Diffstat (limited to '')
| -rw-r--r-- | src/video_core/shader/decode/texture.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/video_core/shader/decode/texture.cpp b/src/video_core/shader/decode/texture.cpp index 542636430..bee7d8cad 100644 --- a/src/video_core/shader/decode/texture.cpp +++ b/src/video_core/shader/decode/texture.cpp | |||
| @@ -527,7 +527,7 @@ Node4 ShaderIR::GetTextureCode(Instruction instr, TextureType texture_type, | |||
| 527 | const bool is_bindless = bindless_reg.has_value(); | 527 | const bool is_bindless = bindless_reg.has_value(); |
| 528 | 528 | ||
| 529 | UNIMPLEMENTED_IF(texture_type == TextureType::TextureCube && is_array && is_shadow); | 529 | UNIMPLEMENTED_IF(texture_type == TextureType::TextureCube && is_array && is_shadow); |
| 530 | ASSERT_MSG(texture_type != TextureType::Texture3D || is_array || is_shadow, | 530 | ASSERT_MSG(texture_type != TextureType::Texture3D || !is_array || !is_shadow, |
| 531 | "Illegal texture type"); | 531 | "Illegal texture type"); |
| 532 | 532 | ||
| 533 | const SamplerInfo info{texture_type, is_array, is_shadow, false}; | 533 | const SamplerInfo info{texture_type, is_array, is_shadow, false}; |