summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/core/core.h1
-rw-r--r--src/video_core/debug_utils/debug_utils.cpp15
-rw-r--r--src/video_core/debug_utils/debug_utils.h14
-rw-r--r--src/yuzu/debugger/graphics/graphics_breakpoints.cpp1
-rw-r--r--src/yuzu/debugger/graphics/graphics_surface.cpp3
5 files changed, 7 insertions, 27 deletions
diff --git a/src/core/core.h b/src/core/core.h
index 7188dabdc..0fab76b7f 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -5,6 +5,7 @@
#pragma once
#include <array>
+#include <map>
#include <memory>
#include <string>
#include <thread>
diff --git a/src/video_core/debug_utils/debug_utils.cpp b/src/video_core/debug_utils/debug_utils.cpp
index 22d44aab2..5ffb492ea 100644
--- a/src/video_core/debug_utils/debug_utils.cpp
+++ b/src/video_core/debug_utils/debug_utils.cpp
@@ -2,23 +2,8 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-#include <algorithm>
-#include <condition_variable>
-#include <cstdint>
-#include <cstring>
-#include <fstream>
-#include <map>
#include <mutex>
-#include <string>
-#include "common/assert.h"
-#include "common/bit_field.h"
-#include "common/color.h"
-#include "common/common_types.h"
-#include "common/file_util.h"
-#include "common/logging/log.h"
-#include "common/math_util.h"
-#include "common/vector_math.h"
#include "video_core/debug_utils/debug_utils.h"
namespace Tegra {
diff --git a/src/video_core/debug_utils/debug_utils.h b/src/video_core/debug_utils/debug_utils.h
index 9382a75e5..c235faf46 100644
--- a/src/video_core/debug_utils/debug_utils.h
+++ b/src/video_core/debug_utils/debug_utils.h
@@ -4,19 +4,11 @@
#pragma once
-#include <algorithm>
#include <array>
#include <condition_variable>
-#include <iterator>
#include <list>
-#include <map>
#include <memory>
#include <mutex>
-#include <string>
-#include <utility>
-#include <vector>
-#include "common/common_types.h"
-#include "common/vector_math.h"
namespace Tegra {
@@ -46,7 +38,7 @@ public:
class BreakPointObserver {
public:
/// Constructs the object such that it observes events of the given DebugContext.
- BreakPointObserver(std::shared_ptr<DebugContext> debug_context)
+ explicit BreakPointObserver(std::shared_ptr<DebugContext> debug_context)
: context_weak(debug_context) {
std::unique_lock<std::mutex> lock(debug_context->breakpoint_mutex);
debug_context->breakpoint_observers.push_back(this);
@@ -141,8 +133,8 @@ public:
}
// TODO: Evaluate if access to these members should be hidden behind a public interface.
- std::array<BreakPoint, (int)Event::NumEvents> breakpoints;
- Event active_breakpoint;
+ std::array<BreakPoint, static_cast<int>(Event::NumEvents)> breakpoints;
+ Event active_breakpoint{};
bool at_breakpoint = false;
private:
diff --git a/src/yuzu/debugger/graphics/graphics_breakpoints.cpp b/src/yuzu/debugger/graphics/graphics_breakpoints.cpp
index eb16a38a0..fe682b3b8 100644
--- a/src/yuzu/debugger/graphics/graphics_breakpoints.cpp
+++ b/src/yuzu/debugger/graphics/graphics_breakpoints.cpp
@@ -2,6 +2,7 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
+#include <map>
#include <QLabel>
#include <QMetaType>
#include <QPushButton>
diff --git a/src/yuzu/debugger/graphics/graphics_surface.cpp b/src/yuzu/debugger/graphics/graphics_surface.cpp
index e037223c2..2b20cf5b9 100644
--- a/src/yuzu/debugger/graphics/graphics_surface.cpp
+++ b/src/yuzu/debugger/graphics/graphics_surface.cpp
@@ -11,12 +11,13 @@
#include <QPushButton>
#include <QScrollArea>
#include <QSpinBox>
+#include "common/vector_math.h"
#include "core/core.h"
+#include "core/memory.h"
#include "video_core/engines/maxwell_3d.h"
#include "video_core/gpu.h"
#include "video_core/textures/decoders.h"
#include "video_core/textures/texture.h"
-#include "video_core/utils.h"
#include "yuzu/debugger/graphics/graphics_surface.h"
#include "yuzu/util/spinbox.h"