summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2019-10-05 14:43:44 +0200
committerLioncash <mathew1800@gmail.com>2019-10-05 15:14:26 +0200
commit3a20d9734fa8996434895bc3d27e4b255ae98bea (patch)
tree44d6844d3eca0c1abe195ae8adfe1d02cd40b123
parentvideo_core/{ast, expr}: Organize forward declaration (diff)
downloadyuzu-3a20d9734fa8996434895bc3d27e4b255ae98bea.tar
yuzu-3a20d9734fa8996434895bc3d27e4b255ae98bea.tar.gz
yuzu-3a20d9734fa8996434895bc3d27e4b255ae98bea.tar.bz2
yuzu-3a20d9734fa8996434895bc3d27e4b255ae98bea.tar.lz
yuzu-3a20d9734fa8996434895bc3d27e4b255ae98bea.tar.xz
yuzu-3a20d9734fa8996434895bc3d27e4b255ae98bea.tar.zst
yuzu-3a20d9734fa8996434895bc3d27e4b255ae98bea.zip
-rw-r--r--src/video_core/shader/ast.cpp24
-rw-r--r--src/video_core/shader/ast.h4
2 files changed, 2 insertions, 26 deletions
diff --git a/src/video_core/shader/ast.cpp b/src/video_core/shader/ast.cpp
index 986e4cd64..2627c563c 100644
--- a/src/video_core/shader/ast.cpp
+++ b/src/video_core/shader/ast.cpp
@@ -374,30 +374,6 @@ void ASTManager::Init() {
false_condition = MakeExpr<ExprBoolean>(false);
}
-ASTManager::ASTManager(ASTManager&& other) noexcept
- : labels_map(std::move(other.labels_map)), labels_count{other.labels_count},
- gotos(std::move(other.gotos)), labels(std::move(other.labels)), variables{other.variables},
- program{other.program}, main_node{other.main_node}, false_condition{other.false_condition},
- disable_else_derivation{other.disable_else_derivation} {
- other.main_node.reset();
-}
-
-ASTManager& ASTManager::operator=(ASTManager&& other) noexcept {
- full_decompile = other.full_decompile;
- labels_map = std::move(other.labels_map);
- labels_count = other.labels_count;
- gotos = std::move(other.gotos);
- labels = std::move(other.labels);
- variables = other.variables;
- program = other.program;
- main_node = other.main_node;
- false_condition = other.false_condition;
- disable_else_derivation = other.disable_else_derivation;
-
- other.main_node.reset();
- return *this;
-}
-
void ASTManager::DeclareLabel(u32 address) {
const auto pair = labels_map.emplace(address, labels_count);
if (pair.second) {
diff --git a/src/video_core/shader/ast.h b/src/video_core/shader/ast.h
index 6d2dc0895..d280ed143 100644
--- a/src/video_core/shader/ast.h
+++ b/src/video_core/shader/ast.h
@@ -313,8 +313,8 @@ public:
ASTManager(const ASTManager& o) = delete;
ASTManager& operator=(const ASTManager& other) = delete;
- ASTManager(ASTManager&& other) noexcept;
- ASTManager& operator=(ASTManager&& other) noexcept;
+ ASTManager(ASTManager&& other) noexcept = default;
+ ASTManager& operator=(ASTManager&& other) noexcept = default;
void Init();