diff options
| author | Rodrigo Locatti <reinuseslisp@airmail.cc> | 2019-11-27 16:26:22 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-27 16:26:22 -0300 |
| commit | 40ec1c22ce7507c8c9ec68ca9e9d4f6a74ec8fe0 (patch) | |
| tree | f606e543bcc33a9164b0f5841df32bfc78c01a44 | |
| parent | 6df6caaf5f3b59a2d1e19a5148a64cc50c61223c (diff) | |
| parent | 9403979c2210c0c75434991fd02e102b971d92fb (diff) | |
Merge pull request #3172 from lioncash/pragma
video_core/const_buffer_locker: Remove #pragma once from cpp file
| -rw-r--r-- | src/video_core/shader/const_buffer_locker.cpp | 10 | ||||
| -rw-r--r-- | src/video_core/shader/const_buffer_locker.h | 1 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/video_core/shader/const_buffer_locker.cpp b/src/video_core/shader/const_buffer_locker.cpp index b65399f91a..a4a0319ebf 100644 --- a/src/video_core/shader/const_buffer_locker.cpp +++ b/src/video_core/shader/const_buffer_locker.cpp @@ -2,11 +2,9 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#pragma once - #include <algorithm> -#include <memory> -#include "common/assert.h" +#include <tuple> + #include "common/common_types.h" #include "video_core/engines/maxwell_3d.h" #include "video_core/engines/shader_type.h" @@ -104,8 +102,8 @@ bool ConstBufferLocker::IsConsistent() const { } bool ConstBufferLocker::HasEqualKeys(const ConstBufferLocker& rhs) const { - return keys == rhs.keys && bound_samplers == rhs.bound_samplers && - bindless_samplers == rhs.bindless_samplers; + return std::tie(keys, bound_samplers, bindless_samplers) == + std::tie(rhs.keys, rhs.bound_samplers, rhs.bindless_samplers); } } // namespace VideoCommon::Shader diff --git a/src/video_core/shader/const_buffer_locker.h b/src/video_core/shader/const_buffer_locker.h index 50a8ce42ac..d32e2d657c 100644 --- a/src/video_core/shader/const_buffer_locker.h +++ b/src/video_core/shader/const_buffer_locker.h @@ -4,6 +4,7 @@ #pragma once +#include <optional> #include <unordered_map> #include "common/common_types.h" #include "common/hash.h" |