summaryrefslogtreecommitdiffstats
path: root/src/video_core/shader
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2019-04-29 04:29:43 +0200
committerGitHub <noreply@github.com>2019-04-29 04:29:43 +0200
commit91e239d66feb6e5cdd80a247a82f22740f2da91b (patch)
treef5c07bde0057e65f96b6910371d6fd6882d05041 /src/video_core/shader
parentMerge pull request #2412 from lioncash/system (diff)
parentshader_ir: Move Sampler index entry in operand< to sort declarations (diff)
downloadyuzu-91e239d66feb6e5cdd80a247a82f22740f2da91b.tar
yuzu-91e239d66feb6e5cdd80a247a82f22740f2da91b.tar.gz
yuzu-91e239d66feb6e5cdd80a247a82f22740f2da91b.tar.bz2
yuzu-91e239d66feb6e5cdd80a247a82f22740f2da91b.tar.lz
yuzu-91e239d66feb6e5cdd80a247a82f22740f2da91b.tar.xz
yuzu-91e239d66feb6e5cdd80a247a82f22740f2da91b.tar.zst
yuzu-91e239d66feb6e5cdd80a247a82f22740f2da91b.zip
Diffstat (limited to 'src/video_core/shader')
-rw-r--r--src/video_core/shader/decode/texture.cpp2
-rw-r--r--src/video_core/shader/shader_ir.h5
2 files changed, 4 insertions, 3 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 =
diff --git a/src/video_core/shader/shader_ir.h b/src/video_core/shader/shader_ir.h
index 81278fb33..65f1e1de9 100644
--- a/src/video_core/shader/shader_ir.h
+++ b/src/video_core/shader/shader_ir.h
@@ -251,8 +251,9 @@ public:
}
bool operator<(const Sampler& rhs) const {
- return std::tie(offset, index, type, is_array, is_shadow) <
- std::tie(rhs.offset, rhs.index, rhs.type, rhs.is_array, rhs.is_shadow);
+ return std::tie(index, offset, type, is_array, is_shadow, is_bindless) <
+ std::tie(rhs.index, rhs.offset, rhs.type, rhs.is_array, rhs.is_shadow,
+ rhs.is_bindless);
}
private: