diff options
author | Fernando Sahmkow <fsahmkow27@gmail.com> | 2019-04-07 14:30:26 +0200 |
---|---|---|
committer | FernandoS27 <fsahmkow27@gmail.com> | 2019-04-08 17:36:11 +0200 |
commit | 492040bd9ce40f86f9845699d68104d31d272155 (patch) | |
tree | d49167082e927cc97e7d6880decd3d26680c7fb9 /src/video_core/shader/shader_ir.h | |
parent | Fix bad rebase (diff) | |
download | yuzu-492040bd9ce40f86f9845699d68104d31d272155.tar yuzu-492040bd9ce40f86f9845699d68104d31d272155.tar.gz yuzu-492040bd9ce40f86f9845699d68104d31d272155.tar.bz2 yuzu-492040bd9ce40f86f9845699d68104d31d272155.tar.lz yuzu-492040bd9ce40f86f9845699d68104d31d272155.tar.xz yuzu-492040bd9ce40f86f9845699d68104d31d272155.tar.zst yuzu-492040bd9ce40f86f9845699d68104d31d272155.zip |
Diffstat (limited to 'src/video_core/shader/shader_ir.h')
-rw-r--r-- | src/video_core/shader/shader_ir.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/video_core/shader/shader_ir.h b/src/video_core/shader/shader_ir.h index 11495799f..249024167 100644 --- a/src/video_core/shader/shader_ir.h +++ b/src/video_core/shader/shader_ir.h @@ -196,7 +196,7 @@ enum class ExitMethod { class Sampler { public: - // Use this constructor for binded Samplers + // Use this constructor for bounded Samplers explicit Sampler(std::size_t offset, std::size_t index, Tegra::Shader::TextureType type, bool is_array, bool is_shadow) : offset{offset}, index{index}, type{type}, is_array{is_array}, is_shadow{is_shadow}, @@ -239,7 +239,7 @@ public: } std::pair<u32, u32> GetBindlessCBuf() const { - return {offset >> 32, offset & 0x00000000FFFFFFFFULL}; + return {static_cast<u32>(offset >> 32), static_cast<u32>(offset)}; } bool operator<(const Sampler& rhs) const { |