diff options
| author | NeoBrainX <NeoBrainX@gmail.com> | 2013-03-26 22:16:29 +0100 |
|---|---|---|
| committer | NeoBrainX <NeoBrainX@gmail.com> | 2013-03-26 22:21:19 +0100 |
| commit | 3253603ae7a80860a294c11c95b3697634ac73d9 (patch) | |
| tree | 5ef2a70521939d71fb3cacbd8a47babd9bdbdba8 /Source/Core/VideoCommon/Src/OpcodeDecoding.h | |
| parent | 76148a52b82cae8e6cf11b6eeeeff55345b0f12e (diff) | |
| parent | b75a617d8a2e4307ed4af06669e92fc33f6af1df (diff) | |
Merge 'master' into shader-uids-awesome.
Conflicts:
Source/Core/VideoCommon/Src/LightingShaderGen.cpp
Source/Core/VideoCommon/Src/PixelShaderGen.cpp
Source/Core/VideoCommon/Src/PixelShaderGen.h
Source/Core/VideoCommon/Src/PixelShaderManager.cpp
Source/Core/VideoCommon/Src/VertexShaderGen.cpp
Source/Core/VideoCommon/Src/VertexShaderGen.h
Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h
Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h
Diffstat (limited to 'Source/Core/VideoCommon/Src/OpcodeDecoding.h')
| -rw-r--r-- | Source/Core/VideoCommon/Src/OpcodeDecoding.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/VideoCommon/Src/OpcodeDecoding.h b/Source/Core/VideoCommon/Src/OpcodeDecoding.h index f2e9cd1321..b825809705 100644 --- a/Source/Core/VideoCommon/Src/OpcodeDecoding.h +++ b/Source/Core/VideoCommon/Src/OpcodeDecoding.h @@ -44,12 +44,12 @@ #define GX_DRAW_LINES 0x5 // 0xA8 #define GX_DRAW_LINE_STRIP 0x6 // 0xB0 #define GX_DRAW_POINTS 0x7 // 0xB8 -#define GX_DRAW_NONE 0x1; //Tis is a fake value to used in the backends +#define GX_DRAW_NONE 0x1; //Tis is a fake value to used in the backends 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 |