octo/yuzu-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Texture_Cache: Remove some unprecise fallback case and clang format

Browse Source
This commit is contained in:
Fernando Sahmkow
2019-07-14 08:41:06 -04:00
committed by FernandoS27
parent 5818959e54
commit 0f54b541f4
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/video_core/texture_cache/surface_params.cpp
View File

@@ -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;
}
}
}

9
src/video_core/texture_cache/texture_cache.h
View File

@@ -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,