From 34692ab826abc8f8faa61bdb2280b742424528f1 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sat, 7 Dec 2013 15:14:29 -0500 Subject: Remove unnecessary Src/ folders --- .../Core/VideoBackends/Software/OpcodeDecoder.cpp | 305 +++++++++++++++++++++ 1 file changed, 305 insertions(+) create mode 100644 Source/Core/VideoBackends/Software/OpcodeDecoder.cpp (limited to 'Source/Core/VideoBackends/Software/OpcodeDecoder.cpp') diff --git a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp new file mode 100644 index 0000000000..21f0a97abd --- /dev/null +++ b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp @@ -0,0 +1,305 @@ +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#include "Common.h" + +#include "DataReader.h" + +#include "OpcodeDecoder.h" +#include "BPMemLoader.h" +#include "CPMemLoader.h" +#include "XFMemLoader.h" +#include "SWVertexLoader.h" +#include "SWStatistics.h" +#include "DebugUtil.h" +#include "SWCommandProcessor.h" +#include "CPMemLoader.h" +#include "SWVideoConfig.h" +#include "HW/Memmap.h" + +typedef void (*DecodingFunction)(u32); + +namespace OpcodeDecoder +{ +static DecodingFunction currentFunction = NULL; +static u32 minCommandSize; +static u16 streamSize; +static u16 streamAddress; +static bool readOpcode; +static SWVertexLoader vertexLoader; +static bool inObjectStream; +static u8 lastPrimCmd; + + +void DoState(PointerWrap &p) +{ + p.Do(minCommandSize); + // Not sure what is wrong with this. Something(s) in here is causing dolphin to crash/hang when loading states saved from another run of dolphin. Doesn't seem too important anyway... + //vertexLoader.DoState(p); + p.Do(readOpcode); + p.Do(inObjectStream); + p.Do(lastPrimCmd); + p.Do(streamSize); + p.Do(streamAddress); + if (p.GetMode() == PointerWrap::MODE_READ) + ResetDecoding(); +} + +void DecodePrimitiveStream(u32 iBufferSize) +{ + u32 vertexSize = vertexLoader.GetVertexSize(); + + bool skipPrimitives = g_bSkipCurrentFrame || + swstats.thisFrame.numDrawnObjects < g_SWVideoConfig.drawStart || + swstats.thisFrame.numDrawnObjects >= g_SWVideoConfig.drawEnd; + + if (skipPrimitives) + { + while (streamSize > 0 && iBufferSize >= vertexSize) + { + g_pVideoData += vertexSize; + iBufferSize -= vertexSize; + streamSize--; + } + } + else + { + while (streamSize > 0 && iBufferSize >= vertexSize) + { + vertexLoader.LoadVertex(); + iBufferSize -= vertexSize; + streamSize--; + } + } + + if (streamSize == 0) + { + // return to normal command processing + ResetDecoding(); + } +} + +void ReadXFData(u32 iBufferSize) +{ + _assert_msg_(VIDEO, iBufferSize >= (u32)(streamSize * 4), "Underflow during standard opcode decoding"); + + u32 pData[16]; + for (int i = 0; i < streamSize; i++) + pData[i] = DataReadU32(); + SWLoadXFReg(streamSize, streamAddress, pData); + + // return to normal command processing + ResetDecoding(); +} + +void ExecuteDisplayList(u32 addr, u32 count) +{ + u8 *videoDataSave = g_pVideoData; + + u8 *dlStart = Memory::GetPointer(addr); + + g_pVideoData = dlStart; + + while (OpcodeDecoder::CommandRunnable(count)) + { + OpcodeDecoder::Run(count); + + // if data was read by the opcode decoder then the video data pointer changed + u32 readCount = (u32)(g_pVideoData - dlStart); + dlStart = g_pVideoData; + + _assert_msg_(VIDEO, count >= readCount, "Display list underrun"); + + count -= readCount; + } + + g_pVideoData = videoDataSave; +} + +void DecodeStandard(u32 bufferSize) +{ + _assert_msg_(VIDEO, CommandRunnable(bufferSize), "Underflow during standard opcode decoding"); + + int Cmd = DataReadU8(); + + if (Cmd == GX_NOP) + return; + // Causes a SIGBUS error on Android + // XXX: Investigate +#ifndef ANDROID + // check if switching in or out of an object + // only used for debugging + if (inObjectStream && (Cmd & 0x87) != lastPrimCmd) + { + inObjectStream = false; + DebugUtil::OnObjectEnd(); + } + if (Cmd & 0x80 && !inObjectStream) + { + inObjectStream = true; + lastPrimCmd = Cmd & 0x87; + DebugUtil::OnObjectBegin(); + } +#endif + switch(Cmd) + { + case GX_NOP: + break; + + case GX_LOAD_CP_REG: //0x08 + { + u32 SubCmd = DataReadU8(); + u32 Value = DataReadU32(); + SWLoadCPReg(SubCmd, Value); + } + break; + + case GX_LOAD_XF_REG: + { + u32 Cmd2 = DataReadU32(); + streamSize = ((Cmd2 >> 16) & 15) + 1; + streamAddress = Cmd2 & 0xFFFF; + currentFunction = ReadXFData; + minCommandSize = streamSize * 4; + readOpcode = false; + } + break; + + case GX_LOAD_INDX_A: //used for position matrices + SWLoadIndexedXF(DataReadU32(), 0xC); + break; + case GX_LOAD_INDX_B: //used for normal matrices + SWLoadIndexedXF(DataReadU32(), 0xD); + break; + case GX_LOAD_INDX_C: //used for postmatrices + SWLoadIndexedXF(DataReadU32(), 0xE); + break; + case GX_LOAD_INDX_D: //used for lights + SWLoadIndexedXF(DataReadU32(), 0xF); + break; + + case GX_CMD_CALL_DL: + { + u32 dwAddr = DataReadU32(); + u32 dwCount = DataReadU32(); + ExecuteDisplayList(dwAddr, dwCount); + } + break; + + case 0x44: + // zelda 4 swords calls it and checks the metrics registers after that + break; + + case GX_CMD_INVL_VC:// Invalidate (vertex cache?) + DEBUG_LOG(VIDEO, "Invalidate (vertex cache?)"); + break; + + case GX_LOAD_BP_REG: //0x61 + { + u32 cmd = DataReadU32(); + SWLoadBPReg(cmd); + } + break; + + // draw primitives + default: + if (Cmd & 0x80) + { + u8 vatIndex = Cmd & GX_VAT_MASK; + u8 primitiveType = (Cmd & GX_PRIMITIVE_MASK) >> GX_PRIMITIVE_SHIFT; + vertexLoader.SetFormat(vatIndex, primitiveType); + + // switch to primitive processing + streamSize = DataReadU16(); + currentFunction = DecodePrimitiveStream; + minCommandSize = vertexLoader.GetVertexSize(); + readOpcode = false; + + INCSTAT(swstats.thisFrame.numPrimatives); + DEBUG_LOG(VIDEO, "Draw begin"); + } + else + { + PanicAlert("GFX: Unknown Opcode (0x%x).\n", Cmd); + break; + } + break; + } +} + + +void Init() +{ + inObjectStream = false; + lastPrimCmd = 0; + ResetDecoding(); +} + +void ResetDecoding() +{ + currentFunction = DecodeStandard; + minCommandSize = 1; + readOpcode = true; +} + +bool CommandRunnable(u32 iBufferSize) +{ + if (iBufferSize < minCommandSize) + return false; + + if (readOpcode) + { + u8 Cmd = DataPeek8(0); + u32 minSize = 1; + + switch(Cmd) + { + case GX_LOAD_CP_REG: //0x08 + minSize = 6; + break; + + case GX_LOAD_XF_REG: + minSize = 5; + break; + + case GX_LOAD_INDX_A: //used for position matrices + minSize = 5; + break; + case GX_LOAD_INDX_B: //used for normal matrices + minSize = 5; + break; + case GX_LOAD_INDX_C: //used for postmatrices + minSize = 5; + break; + case GX_LOAD_INDX_D: //used for lights + minSize = 5; + break; + + case GX_CMD_CALL_DL: + minSize = 9; + break; + + case GX_LOAD_BP_REG: //0x61 + minSize = 5; + break; + + // draw primitives + default: + if (Cmd & 0x80) + minSize = 3; + break; + } + + return (iBufferSize >= minSize); + } + + return true; +} + +void Run(u32 iBufferSize) +{ + currentFunction(iBufferSize); +} + +} -- cgit v1.2.3 From 3fd87a7636ff434118a5d7f7334550be8db55c0b Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 16 Feb 2014 23:51:41 -0500 Subject: Second and final pass of clearing out tabs. --- Source/Core/VideoBackends/Software/OpcodeDecoder.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Core/VideoBackends/Software/OpcodeDecoder.cpp') diff --git a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp index 21f0a97abd..ea2b220d53 100644 --- a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp +++ b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp @@ -191,8 +191,8 @@ void DecodeStandard(u32 bufferSize) // zelda 4 swords calls it and checks the metrics registers after that break; - case GX_CMD_INVL_VC:// Invalidate (vertex cache?) - DEBUG_LOG(VIDEO, "Invalidate (vertex cache?)"); + case GX_CMD_INVL_VC:// Invalidate (vertex cache?) + DEBUG_LOG(VIDEO, "Invalidate (vertex cache?)"); break; case GX_LOAD_BP_REG: //0x61 -- cgit v1.2.3 From 2afe2152712981e21d6bda6f029292ed2b1cf91e Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 17 Feb 2014 05:18:15 -0500 Subject: Convert all includes to relative paths. --- .../Core/VideoBackends/Software/OpcodeDecoder.cpp | 27 ++++++++++------------ 1 file changed, 12 insertions(+), 15 deletions(-) (limited to 'Source/Core/VideoBackends/Software/OpcodeDecoder.cpp') diff --git a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp index ea2b220d53..069876741d 100644 --- a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp +++ b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp @@ -2,21 +2,18 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" - -#include "DataReader.h" - -#include "OpcodeDecoder.h" -#include "BPMemLoader.h" -#include "CPMemLoader.h" -#include "XFMemLoader.h" -#include "SWVertexLoader.h" -#include "SWStatistics.h" -#include "DebugUtil.h" -#include "SWCommandProcessor.h" -#include "CPMemLoader.h" -#include "SWVideoConfig.h" -#include "HW/Memmap.h" +#include "Common/Common.h" +#include "Core/HW/Memmap.h" +#include "VideoBackends/Software/BPMemLoader.h" +#include "VideoBackends/Software/CPMemLoader.h" +#include "VideoBackends/Software/DebugUtil.h" +#include "VideoBackends/Software/OpcodeDecoder.h" +#include "VideoBackends/Software/SWCommandProcessor.h" +#include "VideoBackends/Software/SWStatistics.h" +#include "VideoBackends/Software/SWVertexLoader.h" +#include "VideoBackends/Software/SWVideoConfig.h" +#include "VideoBackends/Software/XFMemLoader.h" +#include "VideoCommon/DataReader.h" typedef void (*DecodingFunction)(u32); -- cgit v1.2.3 From d802d392811be44d34ae9cd23f616db93e54c50f Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Sun, 9 Mar 2014 21:14:26 +0100 Subject: clang-modernize -use-nullptr and s/\bNULL\b/nullptr/g for *.cpp/h/mm files not compiled on my machine --- Source/Core/VideoBackends/Software/OpcodeDecoder.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/VideoBackends/Software/OpcodeDecoder.cpp') diff --git a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp index 069876741d..ff2b4f0bb8 100644 --- a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp +++ b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp @@ -19,7 +19,7 @@ typedef void (*DecodingFunction)(u32); namespace OpcodeDecoder { -static DecodingFunction currentFunction = NULL; +static DecodingFunction currentFunction = nullptr; static u32 minCommandSize; static u16 streamSize; static u16 streamAddress; -- cgit v1.2.3 From 31cfc73a09a8685cbab20502b4bc132e98e2feb5 Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Tue, 11 Mar 2014 00:30:55 +1300 Subject: Fixes spacing for "for", "while", "switch" and "if" Also moved && and || to ends of lines instead of start. Fixed misc vertical alignments and some { needed newlining. --- Source/Core/VideoBackends/Software/OpcodeDecoder.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Core/VideoBackends/Software/OpcodeDecoder.cpp') diff --git a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp index ff2b4f0bb8..f9d01b7de5 100644 --- a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp +++ b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp @@ -139,7 +139,7 @@ void DecodeStandard(u32 bufferSize) DebugUtil::OnObjectBegin(); } #endif - switch(Cmd) + switch (Cmd) { case GX_NOP: break; @@ -250,7 +250,7 @@ bool CommandRunnable(u32 iBufferSize) u8 Cmd = DataPeek8(0); u32 minSize = 1; - switch(Cmd) + switch (Cmd) { case GX_LOAD_CP_REG: //0x08 minSize = 6; -- cgit v1.2.3 From 369c0c4ce20859448a82c509661cbfe90dcc8d44 Mon Sep 17 00:00:00 2001 From: magumagu Date: Thu, 8 May 2014 15:43:41 -0700 Subject: Opcode decoding: 0xC0 isn't a valid command. Fix our opcode decoders to handle this appropriately. --- Source/Core/VideoBackends/Software/OpcodeDecoder.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Core/VideoBackends/Software/OpcodeDecoder.cpp') diff --git a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp index f9d01b7de5..52bd632e15 100644 --- a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp +++ b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp @@ -201,7 +201,7 @@ void DecodeStandard(u32 bufferSize) // draw primitives default: - if (Cmd & 0x80) + if ((Cmd & 0xC0) == 0x80) { u8 vatIndex = Cmd & GX_VAT_MASK; u8 primitiveType = (Cmd & GX_PRIMITIVE_MASK) >> GX_PRIMITIVE_SHIFT; @@ -283,7 +283,7 @@ bool CommandRunnable(u32 iBufferSize) // draw primitives default: - if (Cmd & 0x80) + if ((Cmd & 0xC0) == 0x80) minSize = 3; break; } -- cgit v1.2.3 From 22e1aa5bb4a159d6d66a321f978917614aa36331 Mon Sep 17 00:00:00 2001 From: degasus Date: Tue, 8 Jul 2014 14:29:26 +0200 Subject: mark all local functions as static --- Source/Core/VideoBackends/Software/OpcodeDecoder.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Source/Core/VideoBackends/Software/OpcodeDecoder.cpp') diff --git a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp index 52bd632e15..524a960d3e 100644 --- a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp +++ b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp @@ -43,7 +43,7 @@ void DoState(PointerWrap &p) ResetDecoding(); } -void DecodePrimitiveStream(u32 iBufferSize) +static void DecodePrimitiveStream(u32 iBufferSize) { u32 vertexSize = vertexLoader.GetVertexSize(); @@ -77,7 +77,7 @@ void DecodePrimitiveStream(u32 iBufferSize) } } -void ReadXFData(u32 iBufferSize) +static void ReadXFData(u32 iBufferSize) { _assert_msg_(VIDEO, iBufferSize >= (u32)(streamSize * 4), "Underflow during standard opcode decoding"); @@ -90,7 +90,7 @@ void ReadXFData(u32 iBufferSize) ResetDecoding(); } -void ExecuteDisplayList(u32 addr, u32 count) +static void ExecuteDisplayList(u32 addr, u32 count) { u8 *videoDataSave = g_pVideoData; @@ -114,7 +114,7 @@ void ExecuteDisplayList(u32 addr, u32 count) g_pVideoData = videoDataSave; } -void DecodeStandard(u32 bufferSize) +static void DecodeStandard(u32 bufferSize) { _assert_msg_(VIDEO, CommandRunnable(bufferSize), "Underflow during standard opcode decoding"); -- cgit v1.2.3 From 81ed17be53e7fed93147dc0d334a6c1d45f4e3c8 Mon Sep 17 00:00:00 2001 From: degasus Date: Tue, 8 Jul 2014 16:49:33 +0200 Subject: avoid the extern keyword in .cpp files --- Source/Core/VideoBackends/Software/OpcodeDecoder.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'Source/Core/VideoBackends/Software/OpcodeDecoder.cpp') diff --git a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp index 524a960d3e..33863c892c 100644 --- a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp +++ b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp @@ -14,6 +14,7 @@ #include "VideoBackends/Software/SWVideoConfig.h" #include "VideoBackends/Software/XFMemLoader.h" #include "VideoCommon/DataReader.h" +#include "VideoCommon/Fifo.h" typedef void (*DecodingFunction)(u32); -- cgit v1.2.3 From 522a5c35ad97718478ccdc75ae519ce910dd6dcb Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 29 Jul 2014 20:55:07 -0400 Subject: Convert some more header inclusions into forward declarations --- Source/Core/VideoBackends/Software/OpcodeDecoder.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'Source/Core/VideoBackends/Software/OpcodeDecoder.cpp') diff --git a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp index 33863c892c..f06b31b595 100644 --- a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp +++ b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include "Common/ChunkFile.h" #include "Common/Common.h" #include "Core/HW/Memmap.h" #include "VideoBackends/Software/BPMemLoader.h" -- cgit v1.2.3 From fbc64984ca7de7db10b1a8a4f49002f260c93569 Mon Sep 17 00:00:00 2001 From: Rohit Nirmal Date: Sun, 7 Sep 2014 20:06:58 -0500 Subject: Include CommonTypes.h instead of Common.h. --- Source/Core/VideoBackends/Software/OpcodeDecoder.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/VideoBackends/Software/OpcodeDecoder.cpp') diff --git a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp index f06b31b595..77deeed01f 100644 --- a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp +++ b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp @@ -3,7 +3,7 @@ // Refer to the license.txt file included. #include "Common/ChunkFile.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/HW/Memmap.h" #include "VideoBackends/Software/BPMemLoader.h" #include "VideoBackends/Software/CPMemLoader.h" -- cgit v1.2.3 From 0ae9e398c8e0f808eb4da6cc6f5e3cd553e975a1 Mon Sep 17 00:00:00 2001 From: comex Date: Tue, 26 Aug 2014 13:37:32 -0400 Subject: Rejigger some FIFO buffer variables to be more rational. videoBuffer -> s_video_buffer size -> s_video_buffer_write_ptr g_pVideoData -> g_video_buffer_read_ptr (impl moved to Fifo.cpp) This eradicates the wonderful use of 'size' as a global name, and makes it clear that s_video_buffer_write_ptr and g_video_buffer_read_ptr are the two ends of the FIFO buffer s_video_buffer. Oh, and remove a useless namespace {}. --- Source/Core/VideoBackends/Software/OpcodeDecoder.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Source/Core/VideoBackends/Software/OpcodeDecoder.cpp') diff --git a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp index 77deeed01f..66816e6626 100644 --- a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp +++ b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp @@ -57,7 +57,7 @@ static void DecodePrimitiveStream(u32 iBufferSize) { while (streamSize > 0 && iBufferSize >= vertexSize) { - g_pVideoData += vertexSize; + g_video_buffer_read_ptr += vertexSize; iBufferSize -= vertexSize; streamSize--; } @@ -94,26 +94,26 @@ static void ReadXFData(u32 iBufferSize) static void ExecuteDisplayList(u32 addr, u32 count) { - u8 *videoDataSave = g_pVideoData; + u8 *videoDataSave = g_video_buffer_read_ptr; u8 *dlStart = Memory::GetPointer(addr); - g_pVideoData = dlStart; + g_video_buffer_read_ptr = dlStart; while (OpcodeDecoder::CommandRunnable(count)) { OpcodeDecoder::Run(count); // if data was read by the opcode decoder then the video data pointer changed - u32 readCount = (u32)(g_pVideoData - dlStart); - dlStart = g_pVideoData; + u32 readCount = (u32)(g_video_buffer_read_ptr - dlStart); + dlStart = g_video_buffer_read_ptr; _assert_msg_(VIDEO, count >= readCount, "Display list underrun"); count -= readCount; } - g_pVideoData = videoDataSave; + g_video_buffer_read_ptr = videoDataSave; } static void DecodeStandard(u32 bufferSize) -- cgit v1.2.3 From 50de4238bb1bbceb4797821d8ec428ab1d075aaa Mon Sep 17 00:00:00 2001 From: degasus Date: Sat, 29 Nov 2014 03:39:24 +0100 Subject: VertexLoader: Move the old Datareader function into VertexLoader --- Source/Core/VideoBackends/Software/OpcodeDecoder.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/VideoBackends/Software/OpcodeDecoder.cpp') diff --git a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp index 66816e6626..6ae76c44b5 100644 --- a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp +++ b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp @@ -14,8 +14,8 @@ #include "VideoBackends/Software/SWVertexLoader.h" #include "VideoBackends/Software/SWVideoConfig.h" #include "VideoBackends/Software/XFMemLoader.h" -#include "VideoCommon/DataReader.h" #include "VideoCommon/Fifo.h" +#include "VideoCommon/VertexLoaderUtils.h" typedef void (*DecodingFunction)(u32); -- cgit v1.2.3 From cb86db7b68481edf129a4bfcf6cd44a9a0f32ac8 Mon Sep 17 00:00:00 2001 From: Stevoisiak Date: Sun, 11 Jan 2015 00:17:29 -0500 Subject: Minor consistency changes Mostly small changes, like capitalization and spelling --- Source/Core/VideoBackends/Software/OpcodeDecoder.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/VideoBackends/Software/OpcodeDecoder.cpp') diff --git a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp index 6ae76c44b5..c4c6557111 100644 --- a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp +++ b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp @@ -34,7 +34,7 @@ static u8 lastPrimCmd; void DoState(PointerWrap &p) { p.Do(minCommandSize); - // Not sure what is wrong with this. Something(s) in here is causing dolphin to crash/hang when loading states saved from another run of dolphin. Doesn't seem too important anyway... + // Not sure what is wrong with this. Something(s) in here is causing Dolphin to crash/hang when loading states saved from another run of Dolphin. Doesn't seem too important anyway... //vertexLoader.DoState(p); p.Do(readOpcode); p.Do(inObjectStream); -- cgit v1.2.3 From cefcb0ace9d363b3679b4e93bcc9ec05f1e5f4f8 Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Mon, 18 May 2015 01:08:10 +0200 Subject: Update license headers to GPLv2+ --- Source/Core/VideoBackends/Software/OpcodeDecoder.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/VideoBackends/Software/OpcodeDecoder.cpp') diff --git a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp index c4c6557111..183b9546b4 100644 --- a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp +++ b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp @@ -1,5 +1,5 @@ // Copyright 2013 Dolphin Emulator Project -// Licensed under GPLv2 +// Licensed under GPLv2+ // Refer to the license.txt file included. #include "Common/ChunkFile.h" -- cgit v1.2.3 From 30ebb2459eb97ba544547183854775df8460b475 Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Sun, 24 May 2015 06:55:12 +0200 Subject: Set copyright year to when a file was created --- Source/Core/VideoBackends/Software/OpcodeDecoder.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/VideoBackends/Software/OpcodeDecoder.cpp') diff --git a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp index 183b9546b4..2e9cfa984e 100644 --- a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp +++ b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp @@ -1,4 +1,4 @@ -// Copyright 2013 Dolphin Emulator Project +// Copyright 2009 Dolphin Emulator Project // Licensed under GPLv2+ // Refer to the license.txt file included. -- cgit v1.2.3