stuff/suyu
stuff/suyu
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/suyu.git synced 2024-11-25 21:06:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #1174 from lioncash/debug

Browse source 
debug_utils: Minor individual interface changes
This commit is contained in:
bunnei 2018-08-27 15:44:29 -04:00 committed by GitHub
commit f96ded9815
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/core/core.h
View file

@ -5,6 +5,7 @@
#pragma once #pragma once
#include <array> #include <array>
#include <map>
#include <memory> #include <memory>
#include <string> #include <string>
#include <thread> #include <thread>

15
src/video_core/debug_utils/debug_utils.cpp
View file

@ -2,23 +2,8 @@
// Licensed under GPLv2 // Licensed under GPLv2
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <algorithm>
#include <condition_variable>
#include <cstdint>
#include <cstring>
#include <fstream>
#include <map>
#include <mutex> #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" #include "video_core/debug_utils/debug_utils.h"
namespace Tegra { namespace Tegra {

14
src/video_core/debug_utils/debug_utils.h
View file

@ -4,19 +4,11 @@
#pragma once #pragma once
#include <algorithm>
#include <array> #include <array>
#include <condition_variable> #include <condition_variable>
#include <iterator>
#include <list> #include <list>
#include <map>
#include <memory> #include <memory>
#include <mutex> #include <mutex>
#include <string>
#include <utility>
#include <vector>
#include "common/common_types.h"
#include "common/vector_math.h"
namespace Tegra { namespace Tegra {
@ -46,7 +38,7 @@ public:
class BreakPointObserver { class BreakPointObserver {
public: public:
/// Constructs the object such that it observes events of the given DebugContext. /// 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) { : context_weak(debug_context) {
std::unique_lock<std::mutex> lock(debug_context->breakpoint_mutex); std::unique_lock<std::mutex> lock(debug_context->breakpoint_mutex);
debug_context->breakpoint_observers.push_back(this); 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. // TODO: Evaluate if access to these members should be hidden behind a public interface.
std::array<BreakPoint, (int)Event::NumEvents> breakpoints; std::array<BreakPoint, static_cast<int>(Event::NumEvents)> breakpoints;
Event active_breakpoint; Event active_breakpoint{};
bool at_breakpoint = false; bool at_breakpoint = false;
private: private:

1
src/yuzu/debugger/graphics/graphics_breakpoints.cpp
View file

@ -2,6 +2,7 @@
// 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.
#include <map>
#include <QLabel> #include <QLabel>
#include <QMetaType> #include <QMetaType>
#include <QPushButton> #include <QPushButton>

3
src/yuzu/debugger/graphics/graphics_surface.cpp
View file

@ -11,12 +11,13 @@
#include <QPushButton> #include <QPushButton>
#include <QScrollArea> #include <QScrollArea>
#include <QSpinBox> #include <QSpinBox>
#include "common/vector_math.h"
#include "core/core.h" #include "core/core.h"
#include "core/memory.h"
#include "video_core/engines/maxwell_3d.h" #include "video_core/engines/maxwell_3d.h"
#include "video_core/gpu.h" #include "video_core/gpu.h"
#include "video_core/textures/decoders.h" #include "video_core/textures/decoders.h"
#include "video_core/textures/texture.h" #include "video_core/textures/texture.h"
#include "video_core/utils.h"
#include "yuzu/debugger/graphics/graphics_surface.h" #include "yuzu/debugger/graphics/graphics_surface.h"
#include "yuzu/util/spinbox.h" #include "yuzu/util/spinbox.h"