diff options
author | Fernando Sahmkow <fsahmkow27@gmail.com> | 2019-07-14 14:41:06 +0200 |
---|---|---|
committer | FernandoS27 <fsahmkow27@gmail.com> | 2019-07-14 18:00:32 +0200 |
commit | 0f54b541f4877eda87ad968708fa38ce604c3a80 (patch) | |
tree | f8ef9261aa047c70f0dd5205edb9fecb5f0b8f96 /src/video_core/texture_cache | |
parent | Texture_Cache: Force Framebuffer reset if an active render target is unregistered. (diff) | |
download | yuzu-0f54b541f4877eda87ad968708fa38ce604c3a80.tar yuzu-0f54b541f4877eda87ad968708fa38ce604c3a80.tar.gz yuzu-0f54b541f4877eda87ad968708fa38ce604c3a80.tar.bz2 yuzu-0f54b541f4877eda87ad968708fa38ce604c3a80.tar.lz yuzu-0f54b541f4877eda87ad968708fa38ce604c3a80.tar.xz yuzu-0f54b541f4877eda87ad968708fa38ce604c3a80.tar.zst yuzu-0f54b541f4877eda87ad968708fa38ce604c3a80.zip |
Diffstat (limited to 'src/video_core/texture_cache')
-rw-r--r-- | src/video_core/texture_cache/surface_params.cpp | 9 | ||||
-rw-r--r-- | src/video_core/texture_cache/texture_cache.h | 9 |
2 files changed, 5 insertions, 13 deletions
diff --git a/src/video_core/texture_cache/surface_params.cpp b/src/video_core/texture_cache/surface_params.cpp index df9260859..33c94daa8 100644 --- a/src/video_core/texture_cache/surface_params.cpp +++ b/src/video_core/texture_cache/surface_params.cpp @@ -294,13 +294,14 @@ std::size_t SurfaceParams::GetInnerMipmapMemorySize(u32 level, bool as_host_size const u32 height{GetMipmapSize(uncompressed, GetMipHeight(level), GetDefaultBlockHeight())}; const u32 depth{is_layered ? 1U : GetMipDepth(level)}; if (is_tiled) { - return Tegra::Texture::CalculateSize(!as_host_size, GetBytesPerPixel(), width, height, depth, - GetMipBlockHeight(level), GetMipBlockDepth(level)); + return Tegra::Texture::CalculateSize(!as_host_size, GetBytesPerPixel(), width, height, + depth, GetMipBlockHeight(level), + GetMipBlockDepth(level)); } else { if (as_host_size || IsBuffer()) { - return GetBytesPerPixel()*width*height*depth; + return GetBytesPerPixel() * width * height * depth; } else { - return pitch*height*depth; + return pitch * height * depth; } } } diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index 5e9812bb9..6d3d2da7d 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -662,15 +662,6 @@ private: } return {current_surface, *view}; } - // The next case is unsafe, so if we r in accurate GPU, just skip it - if (Settings::values.use_accurate_gpu_emulation) { - return RecycleSurface(overlaps, params, gpu_addr, preserve_contents, - MatchTopologyResult::FullMatch); - } - // This is the case the texture is a part of the parent. - if (current_surface->MatchesSubTexture(params, gpu_addr)) { - return RebuildSurface(current_surface, params, is_render); - } } else { // If there are many overlaps, odds are they are subtextures of the candidate // surface. We try to construct a new surface based on the candidate parameters, |