From b178c9a3492ea6c0db63f708beecd3dfb3d921fe Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 15 Apr 2020 22:10:40 -0400 Subject: decoder/image: Fix incorrect G24R8 component sizes in GetComponentSize() The components' sizes were mismatched. This corrects that. --- src/video_core/shader/decode/image.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/video_core/shader/decode/image.cpp b/src/video_core/shader/decode/image.cpp index 0dd7a1196..7f94dacc8 100644 --- a/src/video_core/shader/decode/image.cpp +++ b/src/video_core/shader/decode/image.cpp @@ -201,10 +201,10 @@ u32 GetComponentSize(TextureFormat format, std::size_t component) { return 0; case TextureFormat::G24R8: if (component == 0) { - return 8; + return 24; } if (component == 1) { - return 24; + return 8; } return 0; case TextureFormat::G8R8: -- cgit v1.2.3 From 24620bc4ea9ca59a757b7f07ca912f6645c5b8ef Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 15 Apr 2020 22:26:47 -0400 Subject: decode/image: Fix typo in assert in GetComponentSize() --- src/video_core/shader/decode/image.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/video_core/shader/decode/image.cpp b/src/video_core/shader/decode/image.cpp index 7f94dacc8..08ebca38b 100644 --- a/src/video_core/shader/decode/image.cpp +++ b/src/video_core/shader/decode/image.cpp @@ -119,7 +119,7 @@ ComponentType GetComponentType(Tegra::Engines::SamplerDescriptor descriptor, } break; } - UNIMPLEMENTED_MSG("texture format not implement={}", format); + UNIMPLEMENTED_MSG("Texture format not implemented={}", format); return ComponentType::FLOAT; } @@ -212,7 +212,7 @@ u32 GetComponentSize(TextureFormat format, std::size_t component) { case TextureFormat::G4R4: return (component == 0 || component == 1) ? 4 : 0; default: - UNIMPLEMENTED_MSG("texture format not implement={}", format); + UNIMPLEMENTED_MSG("Texture format not implemented={}", format); return 0; } } @@ -249,7 +249,7 @@ std::size_t GetImageComponentMask(TextureFormat format) { case TextureFormat::R1: return std::size_t{R}; default: - UNIMPLEMENTED_MSG("texture format not implement={}", format); + UNIMPLEMENTED_MSG("Texture format not implemented={}", format); return std::size_t{R | G | B | A}; } } -- cgit v1.2.3