Merge branch 'master' into stable

1 files changed, 47 insertions, 0 deletions

diff --git a/Source/Core/VideoCommon/OpcodeDecoding.h b/Source/Core/VideoCommon/OpcodeDecoding.h
new file mode 100644
index 0000000000..ec1b2652e4
--- /dev/null
+++ b/Source/Core/VideoCommon/OpcodeDecoding.h
@@ -0,0 +1,47 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+#include "VideoCommon/DataReader.h"
+
+#define GX_NOP                      0x00
+#define GX_UNKNOWN_RESET            0x01
+
+#define GX_LOAD_BP_REG              0x61
+#define GX_LOAD_CP_REG              0x08
+#define GX_LOAD_XF_REG              0x10
+#define GX_LOAD_INDX_A              0x20
+#define GX_LOAD_INDX_B              0x28
+#define GX_LOAD_INDX_C              0x30
+#define GX_LOAD_INDX_D              0x38
+
+#define GX_CMD_CALL_DL              0x40
+#define GX_CMD_UNKNOWN_METRICS      0x44
+#define GX_CMD_INVL_VC              0x48
+
+#define GX_PRIMITIVE_MASK           0x78
+#define GX_PRIMITIVE_SHIFT          3
+#define GX_VAT_MASK                 0x07
+
+// These values are the values extracted using GX_PRIMITIVE_MASK
+// and GX_PRIMITIVE_SHIFT.
+// GX_DRAW_QUADS_2 behaves the same way as GX_DRAW_QUADS.
+#define GX_DRAW_QUADS               0x0   // 0x80
+#define GX_DRAW_QUADS_2             0x1   // 0x88
+#define GX_DRAW_TRIANGLES           0x2   // 0x90
+#define GX_DRAW_TRIANGLE_STRIP      0x3   // 0x98
+#define GX_DRAW_TRIANGLE_FAN        0x4   // 0xA0
+#define GX_DRAW_LINES               0x5   // 0xA8
+#define GX_DRAW_LINE_STRIP          0x6   // 0xB0
+#define GX_DRAW_POINTS              0x7   // 0xB8
+
+extern bool g_bRecordFifoData;
+
+void OpcodeDecoder_Init();
+void OpcodeDecoder_Shutdown();
+
+template <bool is_preprocess = false>
+u8* OpcodeDecoder_Run(DataReader src, u32* cycles, bool in_display_list);