From 9341ca7979bba04d13d0e25fc7c4f9fbac393be4 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 27 Nov 2019 05:47:47 -0500 Subject: [PATCH 1/3] video_core/const_buffer_locker: Remove #pragma once from cpp file Silences a compiler warning. --- src/video_core/shader/const_buffer_locker.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/video_core/shader/const_buffer_locker.cpp b/src/video_core/shader/const_buffer_locker.cpp index b65399f91..9adcd8163 100644 --- a/src/video_core/shader/const_buffer_locker.cpp +++ b/src/video_core/shader/const_buffer_locker.cpp @@ -2,8 +2,6 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#pragma once - #include #include #include "common/assert.h" From 930e3115261aca06ce1a78b68b17637cc53b8582 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 27 Nov 2019 05:51:13 -0500 Subject: [PATCH 2/3] video_core/const_buffer_locker: Remove unused includes --- src/video_core/shader/const_buffer_locker.cpp | 3 +-- src/video_core/shader/const_buffer_locker.h | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/video_core/shader/const_buffer_locker.cpp b/src/video_core/shader/const_buffer_locker.cpp index 9adcd8163..5dce43b1f 100644 --- a/src/video_core/shader/const_buffer_locker.cpp +++ b/src/video_core/shader/const_buffer_locker.cpp @@ -3,8 +3,7 @@ // Refer to the license.txt file included. #include -#include -#include "common/assert.h" + #include "common/common_types.h" #include "video_core/engines/maxwell_3d.h" #include "video_core/engines/shader_type.h" diff --git a/src/video_core/shader/const_buffer_locker.h b/src/video_core/shader/const_buffer_locker.h index 50a8ce42a..d32e2d657 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 #include #include "common/common_types.h" #include "common/hash.h" From 9403979c2210c0c75434991fd02e102b971d92fb Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 27 Nov 2019 05:53:40 -0500 Subject: [PATCH 3/3] video_core/const_buffer_locker: Make use of std::tie in HasEqualKeys() Tidies it up a little bit visually. --- src/video_core/shader/const_buffer_locker.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/video_core/shader/const_buffer_locker.cpp b/src/video_core/shader/const_buffer_locker.cpp index 5dce43b1f..a4a0319eb 100644 --- a/src/video_core/shader/const_buffer_locker.cpp +++ b/src/video_core/shader/const_buffer_locker.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include +#include #include "common/common_types.h" #include "video_core/engines/maxwell_3d.h" @@ -101,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