diff options
author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-06-01 00:14:34 +0200 |
---|---|---|
committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-07-15 03:36:44 +0200 |
commit | afa8096df5e3c24cb3b639a7fbc65f7225a17137 (patch) | |
tree | 1787485f5b47e86d2c0b2f277cd1085266e5e9b8 /src/video_core/shader/decode/texture.cpp | |
parent | Merge pull request #2675 from ReinUsesLisp/opengl-buffer-cache (diff) | |
download | yuzu-afa8096df5e3c24cb3b639a7fbc65f7225a17137.tar yuzu-afa8096df5e3c24cb3b639a7fbc65f7225a17137.tar.gz yuzu-afa8096df5e3c24cb3b639a7fbc65f7225a17137.tar.bz2 yuzu-afa8096df5e3c24cb3b639a7fbc65f7225a17137.tar.lz yuzu-afa8096df5e3c24cb3b639a7fbc65f7225a17137.tar.xz yuzu-afa8096df5e3c24cb3b639a7fbc65f7225a17137.tar.zst yuzu-afa8096df5e3c24cb3b639a7fbc65f7225a17137.zip |
Diffstat (limited to 'src/video_core/shader/decode/texture.cpp')
-rw-r--r-- | src/video_core/shader/decode/texture.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/video_core/shader/decode/texture.cpp b/src/video_core/shader/decode/texture.cpp index 323be3f14..e1ee5c190 100644 --- a/src/video_core/shader/decode/texture.cpp +++ b/src/video_core/shader/decode/texture.cpp @@ -308,13 +308,9 @@ const Sampler& ShaderIR::GetSampler(const Tegra::Shader::Sampler& sampler, Textu const Sampler& ShaderIR::GetBindlessSampler(const Tegra::Shader::Register& reg, TextureType type, bool is_array, bool is_shadow) { const Node sampler_register = GetRegister(reg); - const Node base_sampler = + const auto [base_sampler, cbuf_index, cbuf_offset] = TrackCbuf(sampler_register, global_code, static_cast<s64>(global_code.size())); - const auto cbuf = std::get_if<CbufNode>(&*base_sampler); - const auto cbuf_offset_imm = std::get_if<ImmediateNode>(&*cbuf->GetOffset()); - ASSERT(cbuf_offset_imm != nullptr); - const auto cbuf_offset = cbuf_offset_imm->GetValue(); - const auto cbuf_index = cbuf->GetIndex(); + ASSERT(base_sampler != nullptr); const auto cbuf_key = (static_cast<u64>(cbuf_index) << 32) | static_cast<u64>(cbuf_offset); // If this sampler has already been used, return the existing mapping. |