mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-23 22:47:19 +02:00
Merge pull request #2435 from ReinUsesLisp/misc-vc
shader_ir: Miscellaneous fixes
This commit is contained in:
commit
91e239d66f
@ -296,7 +296,7 @@ const Sampler& ShaderIR::GetBindlessSampler(const Tegra::Shader::Register& reg,
|
|||||||
ASSERT(cbuf_offset_imm != nullptr);
|
ASSERT(cbuf_offset_imm != nullptr);
|
||||||
const auto cbuf_offset = cbuf_offset_imm->GetValue();
|
const auto cbuf_offset = cbuf_offset_imm->GetValue();
|
||||||
const auto cbuf_index = cbuf->GetIndex();
|
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.
|
// If this sampler has already been used, return the existing mapping.
|
||||||
const auto itr =
|
const auto itr =
|
||||||
|
@ -251,8 +251,9 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool operator<(const Sampler& rhs) const {
|
bool operator<(const Sampler& rhs) const {
|
||||||
return std::tie(offset, index, type, is_array, is_shadow) <
|
return std::tie(index, offset, type, is_array, is_shadow, is_bindless) <
|
||||||
std::tie(rhs.offset, rhs.index, rhs.type, rhs.is_array, rhs.is_shadow);
|
std::tie(rhs.index, rhs.offset, rhs.type, rhs.is_array, rhs.is_shadow,
|
||||||
|
rhs.is_bindless);
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
Loading…
Reference in New Issue
Block a user