diff options
author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-11-09 02:38:26 +0100 |
---|---|---|
committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-11-14 22:21:42 +0100 |
commit | 48a1687f515110b602c64ffbc27eacef3e57a575 (patch) | |
tree | 16a9945ee8d4f01e2d1a7c0dde0313464e1f9c18 /src/video_core/texture_cache/texture_cache.h | |
parent | Merge pull request #3110 from greggameplayer/CompleteRGBA16UI (diff) | |
download | yuzu-48a1687f515110b602c64ffbc27eacef3e57a575.tar yuzu-48a1687f515110b602c64ffbc27eacef3e57a575.tar.gz yuzu-48a1687f515110b602c64ffbc27eacef3e57a575.tar.bz2 yuzu-48a1687f515110b602c64ffbc27eacef3e57a575.tar.lz yuzu-48a1687f515110b602c64ffbc27eacef3e57a575.tar.xz yuzu-48a1687f515110b602c64ffbc27eacef3e57a575.tar.zst yuzu-48a1687f515110b602c64ffbc27eacef3e57a575.zip |
Diffstat (limited to 'src/video_core/texture_cache/texture_cache.h')
-rw-r--r-- | src/video_core/texture_cache/texture_cache.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index 6a92b22d3..8074cc945 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -485,15 +485,13 @@ private: GetSiblingFormat(cr_params.pixel_format) == params.pixel_format) { SurfaceParams new_params = params; new_params.pixel_format = cr_params.pixel_format; - new_params.component_type = cr_params.component_type; new_params.type = cr_params.type; new_surface = GetUncachedSurface(gpu_addr, new_params); } else { new_surface = GetUncachedSurface(gpu_addr, params); } const auto& final_params = new_surface->GetSurfaceParams(); - if (cr_params.type != final_params.type || - (cr_params.component_type != final_params.component_type)) { + if (cr_params.type != final_params.type) { BufferCopy(current_surface, new_surface); } else { std::vector<CopyParams> bricks = current_surface->BreakDown(final_params); @@ -835,12 +833,11 @@ private: } } - const auto inherit_format = ([](SurfaceParams& to, TSurface from) { + const auto inherit_format = [](SurfaceParams& to, TSurface from) { const SurfaceParams& params = from->GetSurfaceParams(); to.pixel_format = params.pixel_format; - to.component_type = params.component_type; to.type = params.type; - }); + }; // Now we got the cases where one or both is Depth and the other is not known if (!incomplete_src) { inherit_format(src_params, deduced_src.surface); |