summaryrefslogtreecommitdiffstats
path: root/src/video_core/shader/shader_ir.h
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2019-03-26 23:18:54 +0100
committerFernandoS27 <fsahmkow27@gmail.com>2019-04-08 17:23:46 +0200
commit7af82ca022fd6f02583e5686d5c69baf0b6a3611 (patch)
tree673ff142206ba69e30e28616c1ae4840fccbeb0f /src/video_core/shader/shader_ir.h
parentUnify both sampler types. (diff)
downloadyuzu-7af82ca022fd6f02583e5686d5c69baf0b6a3611.tar
yuzu-7af82ca022fd6f02583e5686d5c69baf0b6a3611.tar.gz
yuzu-7af82ca022fd6f02583e5686d5c69baf0b6a3611.tar.bz2
yuzu-7af82ca022fd6f02583e5686d5c69baf0b6a3611.tar.lz
yuzu-7af82ca022fd6f02583e5686d5c69baf0b6a3611.tar.xz
yuzu-7af82ca022fd6f02583e5686d5c69baf0b6a3611.tar.zst
yuzu-7af82ca022fd6f02583e5686d5c69baf0b6a3611.zip
Diffstat (limited to 'src/video_core/shader/shader_ir.h')
-rw-r--r--src/video_core/shader/shader_ir.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/video_core/shader/shader_ir.h b/src/video_core/shader/shader_ir.h
index 773c71fa5..ed321cfe5 100644
--- a/src/video_core/shader/shader_ir.h
+++ b/src/video_core/shader/shader_ir.h
@@ -205,8 +205,8 @@ public:
// Use this constructor for bindless Samplers
explicit Sampler(u32 cbuf_index, u32 cbuf_offset, std::size_t index,
Tegra::Shader::TextureType type, bool is_array, bool is_shadow)
- : offset{(static_cast<u64>(cbuf_index) << 32) | cbuf_offset}, index{index}, type{type}, is_array{is_array},
- is_shadow{is_shadow}, is_bindless{true} {}
+ : offset{(static_cast<u64>(cbuf_index) << 32) | cbuf_offset}, index{index}, type{type},
+ is_array{is_array}, is_shadow{is_shadow}, is_bindless{true} {}
// Use this only for serialization/deserialization
explicit Sampler(std::size_t offset, std::size_t index, Tegra::Shader::TextureType type,
@@ -214,7 +214,6 @@ public:
: offset{offset}, index{index}, type{type}, is_array{is_array}, is_shadow{is_shadow},
is_bindless{is_bindless} {}
-
std::size_t GetOffset() const {
return offset;
}
@@ -239,7 +238,7 @@ public:
return is_bindless;
}
- std::pair<u32, u32> GetBindlessCBuf() {
+ std::pair<u32, u32> GetBindlessCBuf() const {
return {offset >> 32, offset & 0x00000000FFFFFFFFULL};
}