diff options
| author | 2015-07-19 20:23:04 +0200 | |
|---|---|---|
| committer | 2015-07-19 20:23:04 +0200 | |
| commit | ef828a1cddf9b628e498ed6aa9f7778d01b7d10e (patch) | |
| tree | 29cd28b2f867724fc4e4eb1744cf8e833c24bda6 /src | |
| parent | Merge pull request #941 from citra-emu/armv6-thumb-mov (diff) | |
| parent | Rasterizer/Textures: Fixed a bug where the I4 format would get twice the real... (diff) | |
| download | yuzu-ef828a1cddf9b628e498ed6aa9f7778d01b7d10e.tar.gz yuzu-ef828a1cddf9b628e498ed6aa9f7778d01b7d10e.tar.xz yuzu-ef828a1cddf9b628e498ed6aa9f7778d01b7d10e.zip | |
Merge pull request #943 from Subv/ia4
Rasterizer/Textures: Fixed a bug where the I4 format would get twice the real stride.
Diffstat (limited to 'src')
| -rw-r--r-- | src/citra_qt/debugger/graphics_cmdlists.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/pica.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/citra_qt/debugger/graphics_cmdlists.cpp b/src/citra_qt/debugger/graphics_cmdlists.cpp index cabf5fe07..da19edef0 100644 --- a/src/citra_qt/debugger/graphics_cmdlists.cpp +++ b/src/citra_qt/debugger/graphics_cmdlists.cpp | |||
| @@ -74,7 +74,7 @@ TextureInfoDockWidget::TextureInfoDockWidget(const Pica::DebugUtils::TextureInfo | |||
| 74 | format_choice->addItem(tr("I8")); | 74 | format_choice->addItem(tr("I8")); |
| 75 | format_choice->addItem(tr("A8")); | 75 | format_choice->addItem(tr("A8")); |
| 76 | format_choice->addItem(tr("IA4")); | 76 | format_choice->addItem(tr("IA4")); |
| 77 | format_choice->addItem(tr("UNK10")); | 77 | format_choice->addItem(tr("I4")); |
| 78 | format_choice->addItem(tr("A4")); | 78 | format_choice->addItem(tr("A4")); |
| 79 | format_choice->addItem(tr("ETC1")); | 79 | format_choice->addItem(tr("ETC1")); |
| 80 | format_choice->addItem(tr("ETC1A4")); | 80 | format_choice->addItem(tr("ETC1A4")); |
diff --git a/src/video_core/pica.h b/src/video_core/pica.h index 026b10a62..5d0d2bf98 100644 --- a/src/video_core/pica.h +++ b/src/video_core/pica.h | |||
| @@ -200,6 +200,7 @@ struct Regs { | |||
| 200 | case TextureFormat::IA8: | 200 | case TextureFormat::IA8: |
| 201 | return 4; | 201 | return 4; |
| 202 | 202 | ||
| 203 | case TextureFormat::I4: | ||
| 203 | case TextureFormat::A4: | 204 | case TextureFormat::A4: |
| 204 | return 1; | 205 | return 1; |
| 205 | 206 | ||