Merge pull request #997 from Lectem/cmdlist_full_debug

citra-qt: Improve pica command list widget (add mask, fix some issues)

1 files changed, 5 insertions, 9 deletions

diff --git a/src/video_core/debug_utils/debug_utils.h b/src/video_core/debug_utils/debug_utils.h
index 0b30d7ffa..85762f5b4 100644
--- a/src/video_core/debug_utils/debug_utils.h
+++ b/src/video_core/debug_utils/debug_utils.h
@@ -187,21 +187,17 @@ void DumpShader(const std::string& filename, const Regs::ShaderConfig& config,
 
 // Utility class to log Pica commands.
 struct PicaTrace {
-    struct Write : public std::pair<u32,u32> {
-        Write(u32 id, u32 value) : std::pair<u32,u32>(id, value) {}
-
-        u32& Id() { return first; }
-        const u32& Id() const { return first; }
-
-        u32& Value() { return second; }
-        const u32& Value() const { return second; }
+    struct Write {
+        u16 cmd_id;
+        u16 mask;
+        u32 value;
     };
     std::vector<Write> writes;
 };
 
 void StartPicaTracing();
 bool IsPicaTracing();
-void OnPicaRegWrite(u32 id, u32 value);
+void OnPicaRegWrite(PicaTrace::Write write);
 std::unique_ptr<PicaTrace> FinishPicaTracing();
 
 struct TextureInfo {