diff options
| author |  Tony Wasserka | 2015-03-07 22:26:55 +0100 |
|---|---|---|
| committer | Tony Wasserka | 2015-03-07 22:26:55 +0100 |
| commit | f29897ca6d712d1082c35fa3270fe2b525368fd5 (patch) | |
| tree | bcf65d090fcd45d39fb446ccae97e18f55c197f2 /src | |
| parent | Merge pull request #538 from yuriks/perf-stat (diff) | |
| parent | GPU/Textures: Fixed ETC texture decoding. (diff) | |
| download | yuzu-f29897ca6d712d1082c35fa3270fe2b525368fd5.tar.gz yuzu-f29897ca6d712d1082c35fa3270fe2b525368fd5.tar.xz yuzu-f29897ca6d712d1082c35fa3270fe2b525368fd5.zip | |
Merge pull request #637 from Subv/etc
GPU/Textures: Fixed ETC texture decoding.
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/debug_utils/debug_utils.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/video_core/debug_utils/debug_utils.cpp b/src/video_core/debug_utils/debug_utils.cpp index a27d3828c..745c4f4ed 100644 --- a/src/video_core/debug_utils/debug_utils.cpp +++ b/src/video_core/debug_utils/debug_utils.cpp | |||
| @@ -505,7 +505,7 @@ const Math::Vec4<u8> LookupTexture(const u8* source, int x, int y, const Texture | |||
| 505 | } | 505 | } |
| 506 | 506 | ||
| 507 | // Add modifier | 507 | // Add modifier |
| 508 | unsigned table_index = (x < 2) ? table_index_2.Value() : table_index_1.Value(); | 508 | unsigned table_index = (x < 2) ? table_index_1.Value() : table_index_2.Value(); |
| 509 | 509 | ||
| 510 | static const auto etc1_modifier_table = std::array<std::array<u8, 2>, 8>{{ | 510 | static const auto etc1_modifier_table = std::array<std::array<u8, 2>, 8>{{ |
| 511 | { 2, 8 }, { 5, 17 }, { 9, 29 }, { 13, 42 }, | 511 | { 2, 8 }, { 5, 17 }, { 9, 29 }, { 13, 42 }, |