summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReinUsesLisp <reinuseslisp@airmail.cc>2019-04-26 06:09:29 +0200
committerReinUsesLisp <reinuseslisp@airmail.cc>2019-04-26 06:09:29 +0200
commit0b91087a1ea44a5c49714870a512745a766f07f7 (patch)
tree6f34dfe432a926d76984d8686a2195acc49e3b15
parentMerge pull request #2416 from lioncash/wait (diff)
downloadyuzu-0b91087a1ea44a5c49714870a512745a766f07f7.tar
yuzu-0b91087a1ea44a5c49714870a512745a766f07f7.tar.gz
yuzu-0b91087a1ea44a5c49714870a512745a766f07f7.tar.bz2
yuzu-0b91087a1ea44a5c49714870a512745a766f07f7.tar.lz
yuzu-0b91087a1ea44a5c49714870a512745a766f07f7.tar.xz
yuzu-0b91087a1ea44a5c49714870a512745a766f07f7.tar.zst
yuzu-0b91087a1ea44a5c49714870a512745a766f07f7.zip
-rw-r--r--src/video_core/shader/decode/texture.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/video_core/shader/decode/texture.cpp b/src/video_core/shader/decode/texture.cpp
index fa65ac9a9..819cc6131 100644
--- a/src/video_core/shader/decode/texture.cpp
+++ b/src/video_core/shader/decode/texture.cpp
@@ -296,7 +296,7 @@ const Sampler& ShaderIR::GetBindlessSampler(const Tegra::Shader::Register& reg,
ASSERT(cbuf_offset_imm != nullptr);
const auto cbuf_offset = cbuf_offset_imm->GetValue();
const auto cbuf_index = cbuf->GetIndex();
- const u64 cbuf_key = (cbuf_index << 32) | cbuf_offset;
+ 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.
const auto itr =