summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorReinUsesLisp <reinuseslisp@airmail.cc>2019-06-30 01:10:31 +0200
committerReinUsesLisp <reinuseslisp@airmail.cc>2019-06-30 01:10:31 +0200
commit8eae66907e043e6e26d78cfc4b5cde7ea93a4f77 (patch)
treed35eddb4b777c0534750b54805d59dcb05586b21 /src
parenttexture_cache: Style changes (diff)
downloadyuzu-8eae66907e043e6e26d78cfc4b5cde7ea93a4f77.tar
yuzu-8eae66907e043e6e26d78cfc4b5cde7ea93a4f77.tar.gz
yuzu-8eae66907e043e6e26d78cfc4b5cde7ea93a4f77.tar.bz2
yuzu-8eae66907e043e6e26d78cfc4b5cde7ea93a4f77.tar.lz
yuzu-8eae66907e043e6e26d78cfc4b5cde7ea93a4f77.tar.xz
yuzu-8eae66907e043e6e26d78cfc4b5cde7ea93a4f77.tar.zst
yuzu-8eae66907e043e6e26d78cfc4b5cde7ea93a4f77.zip
Diffstat (limited to 'src')
-rw-r--r--src/video_core/texture_cache/texture_cache.h27
1 files changed, 10 insertions, 17 deletions
diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h
index 3df3e17dd..8edae3d97 100644
--- a/src/video_core/texture_cache/texture_cache.h
+++ b/src/video_core/texture_cache/texture_cache.h
@@ -97,25 +97,19 @@ public:
return {};
}
const auto params{SurfaceParams::CreateForTexture(system, config, entry)};
- auto pair = GetSurface(gpu_addr, params, true, false);
+ const auto [surface, view] = GetSurface(gpu_addr, params, true, false);
if (guard_samplers) {
- if (sampled_textures_stack_pointer == sampled_textures_stack.size()) {
- sampled_textures_stack.resize(sampled_textures_stack.size() * 2);
- }
- sampled_textures_stack[sampled_textures_stack_pointer] = pair.first;
- sampled_textures_stack_pointer++;
+ sampled_textures.push_back(surface);
}
- return pair.second;
+ return view;
}
bool TextureBarrier() {
- bool must_do = false;
- for (u32 i = 0; i < sampled_textures_stack_pointer; i++) {
- must_do |= sampled_textures_stack[i]->IsRenderTarget();
- sampled_textures_stack[i] = nullptr;
- }
- sampled_textures_stack_pointer = 0;
- return must_do;
+ const bool any_rt =
+ std::any_of(sampled_textures.begin(), sampled_textures.end(),
+ [](const auto& surface) { return surface->IsRenderTarget(); });
+ sampled_textures.clear();
+ return any_rt;
}
TView GetDepthBufferSurface(bool preserve_contents) {
@@ -259,7 +253,7 @@ protected:
make_siblings(PixelFormat::Z32F, PixelFormat::R32F);
make_siblings(PixelFormat::Z32FS8, PixelFormat::RG32F);
- sampled_textures_stack.resize(64);
+ sampled_textures.reserve(64);
}
~TextureCache() = default;
@@ -809,8 +803,7 @@ private:
render_targets;
FramebufferTargetInfo depth_buffer;
- std::vector<TSurface> sampled_textures_stack{};
- u32 sampled_textures_stack_pointer{};
+ std::vector<TSurface> sampled_textures;
StagingCache staging_cache;
std::recursive_mutex mutex;