diff options
| author | 2017-02-04 12:59:33 -0800 | |
|---|---|---|
| committer | 2017-02-04 12:59:33 -0800 | |
| commit | 18c981b99606b40897d8bc2da218e34509873246 (patch) | |
| tree | 7b95528950ba5644b07c3c9340ebdadb0c41db3d /src/video_core/rasterizer.cpp | |
| parent | changed the WIN32 macro in microprofileui (#2528) (diff) | |
| parent | Pica/Texture: Move part of ETC1 decoding to new file and cleanups (diff) | |
| download | yuzu-18c981b99606b40897d8bc2da218e34509873246.tar.gz yuzu-18c981b99606b40897d8bc2da218e34509873246.tar.xz yuzu-18c981b99606b40897d8bc2da218e34509873246.zip | |
Merge pull request #2414 from yuriks/texture-decode
Texture decoding cleanups
Diffstat (limited to 'src/video_core/rasterizer.cpp')
| -rw-r--r-- | src/video_core/rasterizer.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/video_core/rasterizer.cpp b/src/video_core/rasterizer.cpp index b9f5d4533..c034c12d3 100644 --- a/src/video_core/rasterizer.cpp +++ b/src/video_core/rasterizer.cpp | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include "video_core/pica_types.h" | 21 | #include "video_core/pica_types.h" |
| 22 | #include "video_core/rasterizer.h" | 22 | #include "video_core/rasterizer.h" |
| 23 | #include "video_core/shader/shader.h" | 23 | #include "video_core/shader/shader.h" |
| 24 | #include "video_core/texture/texture_decode.h" | ||
| 24 | #include "video_core/utils.h" | 25 | #include "video_core/utils.h" |
| 25 | 26 | ||
| 26 | namespace Pica { | 27 | namespace Pica { |
| @@ -579,10 +580,10 @@ static void ProcessTriangleInternal(const Shader::OutputVertex& v0, const Shader | |||
| 579 | u8* texture_data = | 580 | u8* texture_data = |
| 580 | Memory::GetPhysicalPointer(texture.config.GetPhysicalAddress()); | 581 | Memory::GetPhysicalPointer(texture.config.GetPhysicalAddress()); |
| 581 | auto info = | 582 | auto info = |
| 582 | DebugUtils::TextureInfo::FromPicaRegister(texture.config, texture.format); | 583 | Texture::TextureInfo::FromPicaRegister(texture.config, texture.format); |
| 583 | 584 | ||
| 584 | // TODO: Apply the min and mag filters to the texture | 585 | // TODO: Apply the min and mag filters to the texture |
| 585 | texture_color[i] = DebugUtils::LookupTexture(texture_data, s, t, info); | 586 | texture_color[i] = Texture::LookupTexture(texture_data, s, t, info); |
| 586 | #if PICA_DUMP_TEXTURES | 587 | #if PICA_DUMP_TEXTURES |
| 587 | DebugUtils::DumpTexture(texture.config, texture_data); | 588 | DebugUtils::DumpTexture(texture.config, texture_data); |
| 588 | #endif | 589 | #endif |