summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLiam <byteslice@airmail.cc>2023-12-20 17:07:50 +0100
committerLiam <byteslice@airmail.cc>2023-12-20 17:07:50 +0100
commit4b60aec190696c568383b35aa26a7c5cf88195b6 (patch)
treeb509cdfcb65b6d4347d012ff7ab25dd06700fbf5 /src
parentMerge pull request #12411 from ameerj/gl-nv-tfb-fixups (diff)
downloadyuzu-4b60aec190696c568383b35aa26a7c5cf88195b6.tar
yuzu-4b60aec190696c568383b35aa26a7c5cf88195b6.tar.gz
yuzu-4b60aec190696c568383b35aa26a7c5cf88195b6.tar.bz2
yuzu-4b60aec190696c568383b35aa26a7c5cf88195b6.tar.lz
yuzu-4b60aec190696c568383b35aa26a7c5cf88195b6.tar.xz
yuzu-4b60aec190696c568383b35aa26a7c5cf88195b6.tar.zst
yuzu-4b60aec190696c568383b35aa26a7c5cf88195b6.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/arm/nce/interpreter_visitor.cpp2
-rw-r--r--src/core/arm/nce/visitor_base.h6
2 files changed, 6 insertions, 2 deletions
diff --git a/src/core/arm/nce/interpreter_visitor.cpp b/src/core/arm/nce/interpreter_visitor.cpp
index 8e81c66a5..880f732fc 100644
--- a/src/core/arm/nce/interpreter_visitor.cpp
+++ b/src/core/arm/nce/interpreter_visitor.cpp
@@ -5,8 +5,6 @@
#include "common/bit_cast.h"
#include "core/arm/nce/interpreter_visitor.h"
-#include <dynarmic/frontend/A64/decoder/a64.h>
-
namespace Core {
template <u32 BitSize>
diff --git a/src/core/arm/nce/visitor_base.h b/src/core/arm/nce/visitor_base.h
index 8fb032912..6a2be3d9b 100644
--- a/src/core/arm/nce/visitor_base.h
+++ b/src/core/arm/nce/visitor_base.h
@@ -4,9 +4,15 @@
#pragma once
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
+
#include <dynarmic/frontend/A64/a64_types.h>
+#include <dynarmic/frontend/A64/decoder/a64.h>
#include <dynarmic/frontend/imm.h>
+#pragma GCC diagnostic pop
+
namespace Core {
class VisitorBase {