diff options
| author | degasus <wickmarkus@web.de> | 2013-03-12 11:28:56 +0100 |
|---|---|---|
| committer | degasus <wickmarkus@web.de> | 2013-03-12 11:28:56 +0100 |
| commit | 382be2aabdf0635c67f9ec945283f77f8ed9b0c9 (patch) | |
| tree | 8df3cf8a3539e4b4b1a96772f17c353f99393ed5 /Source/Core/VideoCommon/Src/OpcodeDecoding.h | |
| parent | e1ca002937cf8915ab9fb04f82e2dc5e68db1fa2 (diff) | |
| parent | 83fc5f4747f9c8c6066bf002730827ecc17458aa (diff) | |
Merge branch 'master' into GLSL-master
Conflicts:
.gitignore
Diffstat (limited to 'Source/Core/VideoCommon/Src/OpcodeDecoding.h')
| -rw-r--r-- | Source/Core/VideoCommon/Src/OpcodeDecoding.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/VideoCommon/Src/OpcodeDecoding.h b/Source/Core/VideoCommon/Src/OpcodeDecoding.h index f2e9cd1321..71a15477a3 100644 --- a/Source/Core/VideoCommon/Src/OpcodeDecoding.h +++ b/Source/Core/VideoCommon/Src/OpcodeDecoding.h @@ -50,6 +50,6 @@ extern bool g_bRecordFifoData; void OpcodeDecoder_Init(); void OpcodeDecoder_Shutdown(); -void OpcodeDecoder_Run(bool skipped_frame); +u32 OpcodeDecoder_Run(bool skipped_frame); void ExecuteDisplayList(u32 address, u32 size); #endif // _OPCODE_DECODING_H |