diff options
| author |  bunnei | 2019-04-28 22:29:43 -0400 |
|---|---|---|
| committer |  GitHub | 2019-04-28 22:29:43 -0400 |
| commit | 91e239d66feb6e5cdd80a247a82f22740f2da91b (patch) | |
| tree | f5c07bde0057e65f96b6910371d6fd6882d05041 /src/video_core/shader/decode | |
| parent | Merge pull request #2412 from lioncash/system (diff) | |
| parent | shader_ir: Move Sampler index entry in operand< to sort declarations (diff) | |
| download | yuzu-91e239d66feb6e5cdd80a247a82f22740f2da91b.tar.gz yuzu-91e239d66feb6e5cdd80a247a82f22740f2da91b.tar.xz yuzu-91e239d66feb6e5cdd80a247a82f22740f2da91b.zip | |
Merge pull request #2435 from ReinUsesLisp/misc-vc
shader_ir: Miscellaneous fixes
Diffstat (limited to 'src/video_core/shader/decode')
| -rw-r--r-- | src/video_core/shader/decode/texture.cpp | 2 |
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, | |||
| 296 | ASSERT(cbuf_offset_imm != nullptr); | 296 | ASSERT(cbuf_offset_imm != nullptr); |
| 297 | const auto cbuf_offset = cbuf_offset_imm->GetValue(); | 297 | const auto cbuf_offset = cbuf_offset_imm->GetValue(); |
| 298 | const auto cbuf_index = cbuf->GetIndex(); | 298 | const auto cbuf_index = cbuf->GetIndex(); |
| 299 | const u64 cbuf_key = (cbuf_index << 32) | cbuf_offset; | 299 | const auto cbuf_key = (static_cast<u64>(cbuf_index) << 32) | static_cast<u64>(cbuf_offset); |
| 300 | 300 | ||
| 301 | // If this sampler has already been used, return the existing mapping. | 301 | // If this sampler has already been used, return the existing mapping. |
| 302 | const auto itr = | 302 | const auto itr = |