summaryrefslogtreecommitdiffstats
path: root/src/video_core
diff options
context:
space:
mode:
authorReinUsesLisp <reinuseslisp@airmail.cc>2019-06-30 01:47:46 +0200
committerReinUsesLisp <reinuseslisp@airmail.cc>2019-06-30 01:47:46 +0200
commit6e1db6b7038329a9716763c8bdf14cc5b578fec1 (patch)
tree595cb82e8f6f70d2bd740a8288e95a2a3703cb18 /src/video_core
parenttexture_cache: Use std::vector reservation for sampled_textures (diff)
downloadyuzu-6e1db6b7038329a9716763c8bdf14cc5b578fec1.tar
yuzu-6e1db6b7038329a9716763c8bdf14cc5b578fec1.tar.gz
yuzu-6e1db6b7038329a9716763c8bdf14cc5b578fec1.tar.bz2
yuzu-6e1db6b7038329a9716763c8bdf14cc5b578fec1.tar.lz
yuzu-6e1db6b7038329a9716763c8bdf14cc5b578fec1.tar.xz
yuzu-6e1db6b7038329a9716763c8bdf14cc5b578fec1.tar.zst
yuzu-6e1db6b7038329a9716763c8bdf14cc5b578fec1.zip
Diffstat (limited to 'src/video_core')
-rw-r--r--src/video_core/texture_cache/texture_cache.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h
index 8edae3d97..c9e72531a 100644
--- a/src/video_core/texture_cache/texture_cache.h
+++ b/src/video_core/texture_cache/texture_cache.h
@@ -421,8 +421,7 @@ private:
const auto& cr_params = current_surface->GetSurfaceParams();
TSurface new_surface;
if (cr_params.pixel_format != params.pixel_format && !is_render &&
- siblings_table[static_cast<std::size_t>(cr_params.pixel_format)] ==
- params.pixel_format) {
+ 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;
@@ -459,17 +458,16 @@ private:
const SurfaceParams& params, bool is_render) {
const bool is_mirage = !current_surface->MatchFormat(params.pixel_format);
const bool matches_target = current_surface->MatchTarget(params.target);
- const auto match_check = ([&]() -> std::pair<TSurface, TView> {
+ const auto match_check = [&]() -> std::pair<TSurface, TView> {
if (matches_target) {
return {current_surface, current_surface->GetMainView()};
}
return {current_surface, current_surface->EmplaceOverview(params)};
- });
+ };
if (!is_mirage) {
return match_check();
}
- if (!is_render && siblings_table[static_cast<std::size_t>(current_surface->GetFormat())] ==
- params.pixel_format) {
+ if (!is_render && GetSiblingFormat(current_surface->GetFormat()) == params.pixel_format) {
return match_check();
}
return RebuildSurface(current_surface, params, is_render);
@@ -766,6 +764,10 @@ private:
return {};
}
+ constexpr PixelFormat GetSiblingFormat(PixelFormat format) const {
+ return siblings_table[static_cast<std::size_t>(format)];
+ }
+
struct FramebufferTargetInfo {
TSurface target;
TView view;