diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-01-05 23:11:23 +0100 |
---|---|---|
committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-02-04 21:31:40 +0100 |
commit | a1c9ac7845395c250a78fc8df93a9ffed29f3d5b (patch) | |
tree | 7e3768df24f82e9e732302318326113419309d33 /src/video_core/renderer_opengl | |
parent | Merge pull request #2496 from mailwl/cfg-mem (diff) | |
download | yuzu-a1c9ac7845395c250a78fc8df93a9ffed29f3d5b.tar yuzu-a1c9ac7845395c250a78fc8df93a9ffed29f3d5b.tar.gz yuzu-a1c9ac7845395c250a78fc8df93a9ffed29f3d5b.tar.bz2 yuzu-a1c9ac7845395c250a78fc8df93a9ffed29f3d5b.tar.lz yuzu-a1c9ac7845395c250a78fc8df93a9ffed29f3d5b.tar.xz yuzu-a1c9ac7845395c250a78fc8df93a9ffed29f3d5b.tar.zst yuzu-a1c9ac7845395c250a78fc8df93a9ffed29f3d5b.zip |
Diffstat (limited to 'src/video_core/renderer_opengl')
-rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer_cache.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp index 1e7eedecb..4167d3161 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp @@ -17,10 +17,10 @@ #include "common/vector_math.h" #include "core/frontend/emu_window.h" #include "core/memory.h" -#include "video_core/debug_utils/debug_utils.h" #include "video_core/pica_state.h" #include "video_core/renderer_opengl/gl_rasterizer_cache.h" #include "video_core/renderer_opengl/gl_state.h" +#include "video_core/texture/texture_decode.h" #include "video_core/utils.h" #include "video_core/video_core.h" @@ -339,7 +339,7 @@ CachedSurface* RasterizerCacheOpenGL::GetSurface(const CachedSurface& params, bo std::vector<Math::Vec4<u8>> tex_buffer(params.width * params.height); - Pica::DebugUtils::TextureInfo tex_info; + Pica::Texture::TextureInfo tex_info; tex_info.width = params.width; tex_info.height = params.height; tex_info.stride = @@ -349,7 +349,7 @@ CachedSurface* RasterizerCacheOpenGL::GetSurface(const CachedSurface& params, bo for (unsigned y = 0; y < params.height; ++y) { for (unsigned x = 0; x < params.width; ++x) { - tex_buffer[x + params.width * y] = Pica::DebugUtils::LookupTexture( + tex_buffer[x + params.width * y] = Pica::Texture::LookupTexture( texture_src_data, x, params.height - 1 - y, tex_info); } } @@ -512,8 +512,9 @@ CachedSurface* RasterizerCacheOpenGL::GetSurfaceRect(const CachedSurface& params CachedSurface* RasterizerCacheOpenGL::GetTextureSurface( const Pica::Regs::FullTextureConfig& config) { - Pica::DebugUtils::TextureInfo info = - Pica::DebugUtils::TextureInfo::FromPicaRegister(config.config, config.format); + + Pica::Texture::TextureInfo info = + Pica::Texture::TextureInfo::FromPicaRegister(config.config, config.format); CachedSurface params; params.addr = info.physical_address; |