Linuxydable/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

Merge pull request #3172 from lioncash/pragma

Browse source 
video_core/const_buffer_locker: Remove #pragma once from cpp file
This commit is contained in:
Rodrigo Locatti 2019-11-27 16:26:22 -03:00 committed by GitHub
commit 40ec1c22ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/video_core/shader/const_buffer_locker.cpp
View file

@ -2,11 +2,9 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#pragma once
#include <algorithm> #include <algorithm>
#include <memory> #include <tuple>
#include "common/assert.h"
#include "common/common_types.h" #include "common/common_types.h"
#include "video_core/engines/maxwell_3d.h" #include "video_core/engines/maxwell_3d.h"
#include "video_core/engines/shader_type.h" #include "video_core/engines/shader_type.h"
@ -104,8 +102,8 @@ bool ConstBufferLocker::IsConsistent() const {
} }
bool ConstBufferLocker::HasEqualKeys(const ConstBufferLocker& rhs) const { bool ConstBufferLocker::HasEqualKeys(const ConstBufferLocker& rhs) const {
return keys == rhs.keys && bound_samplers == rhs.bound_samplers && return std::tie(keys, bound_samplers, bindless_samplers) ==
bindless_samplers == rhs.bindless_samplers; std::tie(rhs.keys, rhs.bound_samplers, rhs.bindless_samplers);
} }
} // namespace VideoCommon::Shader } // namespace VideoCommon::Shader

1
src/video_core/shader/const_buffer_locker.h
View file

@ -4,6 +4,7 @@
#pragma once #pragma once
#include <optional>
#include <unordered_map> #include <unordered_map>
#include "common/common_types.h" #include "common/common_types.h"
#include "common/hash.h" #include "common/hash.h"