Merge remote-tracking branch 'origin/master' into Android-trash

Conflicts:
	Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp

Source/Core/Core/Src/ActionReplay.cpp

@@ -535,7 +535,7 @@ bool Subtype_RamWriteAndFill(const ARAddr addr, const u32 data)
 
 	case DATATYPE_32BIT_FLOAT:
 	case DATATYPE_32BIT: // Dword write
-		LogInfo("32bit Write");
+		LogInfo("32-bit Write");
 		LogInfo("--------");
 		Memory::Write_U32(data, new_addr);
 		LogInfo("Wrote %08x to address %08x", data, new_addr);

Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #include "VideoCommon.h"

Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.h

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #ifndef _BPMEMLOADER_H_

Source/Plugins/Plugin_VideoSoftware/Src/CPMemLoader.h

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #ifndef _CPMEMLOADER_H_

Source/Plugins/Plugin_VideoSoftware/Src/Clipper.cpp

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 /*
@@ -267,12 +267,14 @@ namespace Clipper
 
 		int numVertices = 2;
 
-		if (clip_mask[0]) {
+		if (clip_mask[0])
+		{
 			indices[0] = numVertices;
 			AddInterpolatedVertex(t0, 0, 1, numVertices);
 		}
 
-		if (clip_mask[1]) {
+		if (clip_mask[1])
+		{
 			indices[1] = numVertices;
 			AddInterpolatedVertex(t1, 1, 0, numVertices);
 		}

Source/Plugins/Plugin_VideoSoftware/Src/Clipper.h

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #ifndef _CLIPPER_H_

Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.cpp

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #include "Common.h"
@@ -148,7 +148,9 @@ void DumpEfb(const char* filename)
 	u8 sample[4];
 
 	for (int y = 0; y < EFB_HEIGHT; y++)
-        for (int x = 0; x < EFB_WIDTH; x++) {
+	{
+		for (int x = 0; x < EFB_WIDTH; x++)
+		{
 			EfbInterface::GetColor(x, y, sample);
 			// ABGR to BGRA
 			*(writePtr++) = sample[1];
@@ -156,6 +158,7 @@ void DumpEfb(const char* filename)
 			*(writePtr++) = sample[3];
 			*(writePtr++) = sample[0];
 		}
+	}
 
 	(void)SaveTGA(filename, EFB_WIDTH, EFB_HEIGHT, data);
 
@@ -168,7 +171,9 @@ void DumpDepth(const char* filename)
 	u8 *writePtr = data;
 
 	for (int y = 0; y < EFB_HEIGHT; y++)
-        for (int x = 0; x < EFB_WIDTH; x++) {
+	{
+		for (int x = 0; x < EFB_WIDTH; x++)
+		{
 			u32 depth = EfbInterface::GetDepth(x, y);
 			// depth to bgra
 			*(writePtr++) = (depth >> 16) & 0xff;
@@ -176,6 +181,7 @@ void DumpDepth(const char* filename)
 			*(writePtr++) = depth & 0xff;
 			*(writePtr++) = 255;
 		}
+	}
 
 	(void)SaveTGA(filename, EFB_WIDTH, EFB_HEIGHT, data);
 

Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.h

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #ifndef _DEBUGUTIL_H

Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.cpp

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #include "BPMemLoader.h"
@@ -42,7 +42,6 @@ namespace EfbCopy
 		}
 
 		SWRenderer::SwapBuffer();
-
 	}
 
 	void CopyToRam()

Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.h

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #ifndef _EFB_COPY_H_

Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.cpp

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #include "Common.h"
@@ -345,7 +345,8 @@ namespace EfbInterface
 
 	void LogicBlend(u32 srcClr, u32 &dstClr, int op)
 	{
-        switch (op) {
+		switch (op)
+		{
 			case 0:  // clear
 				dstClr = 0;
 				break;
@@ -423,9 +424,13 @@ namespace EfbInterface
 				BlendColor(color, dstClrPtr);
 		}
 		else if (bpmem.blendmode.logicopenable)
+		{
 			LogicBlend(*((u32*)color), dstClr, bpmem.blendmode.logicmode);
+		}
 		else
+		{
 			dstClrPtr = color;
+		}
 
 		if (bpmem.dstalpha.enable)
 			dstClrPtr[ALP_C] = bpmem.dstalpha.alpha;
@@ -438,7 +443,9 @@ namespace EfbInterface
 				SetPixelColorOnly(offset, dstClrPtr);
 		}
 		else if (bpmem.blendmode.alphaupdate)
+		{
 			SetPixelAlphaOnly(offset, dstClrPtr[ALP_C]);
+		}
 
 		// branchless bounding box update
 		SWPixelEngine::pereg.boxLeft = SWPixelEngine::pereg.boxLeft>x?x:SWPixelEngine::pereg.boxLeft;
@@ -458,8 +465,10 @@ namespace EfbInterface
 				SetPixelColorOnly(offset, color);
 		}
 		else if (bpmem.blendmode.alphaupdate)
+		{
 			SetPixelAlphaOnly(offset, color[ALP_C]);
 		}
+	}
 
 	void SetDepth(u16 x, u16 y, u32 depth)
 	{

Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.h

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #ifndef _EFB_INTERFACE_H_

Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #include "Common.h"
@@ -369,8 +369,8 @@ namespace HwRasterizer
 
 		// extra checks cause textures to be reloaded much more
 		if (texUnit.texImage0[0].hex != texImage0.hex ||
-		//texUnit.texImage1[0].hex != texImage1.hex ||
-		//texUnit.texImage2[0].hex != texImage2.hex ||
+		//	texUnit.texImage1[0].hex != texImage1.hex ||
+		//	texUnit.texImage2[0].hex != texImage2.hex ||
 			texUnit.texImage3[0].hex != texImage3.hex ||
 			texUnit.texTlut[0].hex   != texTlut.hex)
 		{

Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.h

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #ifndef _HW_RASTERIZER_H

Source/Plugins/Plugin_VideoSoftware/Src/NativeVertexFormat.h

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #ifndef _NATIVEVERTEXFORMAT_H

Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #include "Common.h"

Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.h

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 

Source/Plugins/Plugin_VideoSoftware/Src/RasterFont.cpp

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #include "../../Plugin_VideoOGL/Src/GLUtil.h"
@@ -124,9 +124,11 @@ RasterFont::RasterFont()
 {
 	// set GL modes
 	glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+
 	// create the raster font
 	fontOffset = glGenLists(128);
-	for (int i = 32; i < 127; i++) {
+	for (int i = 32; i < 127; i++)
+	{
 		glNewList(i + fontOffset, GL_COMPILE);
 		glBitmap(8, 13, 0.0f, 2.0f, 10.0f, 0.0f, rasters[i - 32]);
 		glEndList();
@@ -153,7 +155,8 @@ void RasterFont::printString(const char *s, double x, double y, double z)
 	char *s2 = temp_buffer;
 	memcpy(s2, s, length);
 	s2[length] = 0;
-	for (int i = 0; i < length; i++) {
+	for (int i = 0; i < length; i++)
+	{
 		if (s2[i] < 32 || s2[i] > 126)
 			s2[i] = '!';
 	}
@@ -209,7 +212,9 @@ void RasterFont::printMultilineText(const char *text, double start_x, double sta
 			*t++ = ' ';
 		}
 		else
+		{
 			*t++ = *text;
+		}
 
 		text++;
 	}

Source/Plugins/Plugin_VideoSoftware/Src/RasterFont.h

@@ -12,13 +12,14 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #ifndef _RASTERFONT_H_
 #define _RASTERFONT_H_
 
-class RasterFont {
+class RasterFont
+{
 public:
 	RasterFont();
 	~RasterFont(void);

Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #include "Common.h"
@@ -458,7 +458,8 @@ void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVer
 			int c = (c00 << 0) | (c10 << 1) | (c01 << 2) | (c11 << 3);
 
 			// Skip block when outside an edge
-            if(a == 0x0 || b == 0x0 || c == 0x0) continue;
+			if(a == 0x0 || b == 0x0 || c == 0x0)
+				continue;
 
 			BuildBlock(x, y);
 
@@ -504,9 +505,7 @@ void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVer
 			}
 		}
 	}
-
 }
 
 
-
 }

Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.h

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #ifndef _RASTERIZER_H_
@@ -62,7 +62,6 @@ namespace Rasterizer
 	};
 
 	void DoState(PointerWrap &p);
-    
 }
 
 #endif

Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.cpp

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #include "Common.h"
@@ -128,7 +128,8 @@ void RunGpu()
 		FPURoundMode::LoadDefaultSIMDState();
 
 		// run the opcode decoder
-        do {
+		do
+		{
 			RunBuffer();
 		} while (cpreg.ctrl.GPReadEnable && !AtBreakpoint() && cpreg.readptr != cpreg.writeptr);
 
@@ -248,11 +249,11 @@ void Write16(const u16 _Value, const u32 _Address)
 
 	case FIFO_BP_LO:
 		WriteLow ((u32 &)cpreg.breakpt, _Value & 0xFFE0);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_BP_LO. breakpt is : %08x", cpreg.breakpt);
+		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_BP_LO. breakpoint is : %08x", cpreg.breakpt);
 		break;
 	case FIFO_BP_HI:
 		WriteHigh ((u32 &)cpreg.breakpt, _Value);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_BP_HI. breakpt is : %08x", cpreg.breakpt);
+		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_BP_HI. breakpoint is : %08x", cpreg.breakpt);
 		break;
 
 	case FIFO_RW_DISTANCE_LO:
@@ -399,8 +400,10 @@ void SetStatus()
 			SWCommandProcessor::UpdateInterruptsFromVideoBackend(userdata);
 		}
 		else
+		{
 			SWCommandProcessor::UpdateInterrupts(userdata);
 		}
+	}
 }
 
 bool RunBuffer()

Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.h

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #ifndef _COMMANDPROCESSOR_H_

Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.cpp

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 

Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.h

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 #ifndef _PIXELENGINE_H
 #define _PIXELENGINE_H

Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #include "Common.h"
@@ -129,7 +129,7 @@ void SWRenderer::DrawDebugText()
 		p+=sprintf(p,"Rasterized Pix:   %i\n",swstats.thisFrame.rasterizedPixels);
 		p+=sprintf(p,"TEV Pix In:   %i\n",swstats.thisFrame.tevPixelsIn);
 		p+=sprintf(p,"TEV Pix Out:   %i\n",swstats.thisFrame.tevPixelsOut);
-}
+	}
 
 	// Render a shadow, and then the text.
 	SWRenderer::RenderText(debugtext_buffer, 21, 21, 0xDD000000);

Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.h

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #ifndef _RENDERER_H_

Source/Plugins/Plugin_VideoSoftware/Src/SWStatistics.cpp

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #include "SWStatistics.h"

Source/Plugins/Plugin_VideoSoftware/Src/SWStatistics.h

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #include "CommonTypes.h"

Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.cpp

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #include "Common.h"
@@ -76,11 +76,13 @@ void SWVertexLoader::SetFormat(u8 attributeIndex, u8 primitiveType)
 		g_VtxDesc.Tex0MatIdx, g_VtxDesc.Tex1MatIdx, g_VtxDesc.Tex2MatIdx, g_VtxDesc.Tex3MatIdx,
 		g_VtxDesc.Tex4MatIdx, g_VtxDesc.Tex5MatIdx, g_VtxDesc.Tex6MatIdx, g_VtxDesc.Tex7MatIdx
 	};
+
 	// Colors
 	const u32 colDesc[2] = {g_VtxDesc.Color0, g_VtxDesc.Color1};
 	colElements[0] = m_CurrentVat->g0.Color0Elements;
 	colElements[1] = m_CurrentVat->g0.Color1Elements;
 	const u32 colComp[2] = {m_CurrentVat->g0.Color0Comp, m_CurrentVat->g0.Color1Comp};
+
 	// TextureCoord
 	const u32 tcDesc[8] = {
 		g_VtxDesc.Tex0Coord, g_VtxDesc.Tex1Coord, g_VtxDesc.Tex2Coord, g_VtxDesc.Tex3Coord,
@@ -147,12 +149,14 @@ void SWVertexLoader::SetFormat(u8 attributeIndex, u8 primitiveType)
 	m_Vertex.texMtx[7] = MatrixIndexB.Tex7MtxIdx;
 #endif
 
-    if (g_VtxDesc.PosMatIdx != NOT_PRESENT) {
+	if (g_VtxDesc.PosMatIdx != NOT_PRESENT)
+	{
 		AddAttributeLoader(LoadPosMtx);
 		m_VertexSize++;
 	}
 
-    for (int i = 0; i < 8; ++i) {
+	for (int i = 0; i < 8; ++i)
+	{
 		if (tmDesc[i] != NOT_PRESENT)
 		{
 			AddAttributeLoader(LoadTexMtx, i);
@@ -181,7 +185,8 @@ void SWVertexLoader::SetFormat(u8 attributeIndex, u8 primitiveType)
 		AddAttributeLoader(LoadNormal);
 	}
 
-	for (int i = 0; i < 2; i++) {
+	for (int i = 0; i < 2; i++)
+	{
 		switch (colDesc[i])
 		{
 		case NOT_PRESENT:
@@ -232,7 +237,8 @@ void SWVertexLoader::SetFormat(u8 attributeIndex, u8 primitiveType)
 	}
 
 	// Texture matrix indices (remove if corresponding texture coordinate isn't enabled)
-	for (int i = 0; i < 8; i++) {
+	for (int i = 0; i < 8; i++)
+	{
 		const int desc = tcDesc[i];
 		const int format = tcFormat[i];
 		const int elements = tcElements[i];
@@ -252,7 +258,6 @@ void SWVertexLoader::SetFormat(u8 attributeIndex, u8 primitiveType)
 		(g_VtxDesc.Tex0Coord != NOT_PRESENT) &&
 		(swxfregs.texMtxInfo[0].projection == XF_TEXPROJ_ST);
 
-
 	m_SetupUnit->Init(primitiveType);
 }
 

Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.h

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #ifndef _VERTEXLOADER_H_

Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.cpp

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #include "FileUtil.h"

Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.h

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #ifndef _VIDEOSOFTWARE_CONFIG_H_

Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 
@@ -220,8 +220,10 @@ u32 VideoSoftware::Video_AccessEFB(EFBAccessType type, u32 x, u32 y, u32 InputDa
 			value = EfbInterface::GetDepth(x, y);
 			break;
 		}
+
 	case POKE_Z:
 		break;
+
 	case PEEK_COLOR:
 		{
 			u32 color = 0;

Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.cpp

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #include "SetupUnit.h"
@@ -80,7 +80,7 @@ void SetupUnit::SetupVertex()
 	OutputVertexData* temp = m_VertPointer[1];
 	m_VertPointer[1] = m_VertPointer[2];
 	m_VertPointer[2] = temp;
- }
+}
 
 void SetupUnit::SetupTriangle()
 {

Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.h

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 

Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #include "Common.h"
@@ -438,7 +438,8 @@ static bool TevAlphaTest(int alpha)
 	bool comp0 = AlphaCompare(alpha, bpmem.alpha_test.ref0, bpmem.alpha_test.comp0);
 	bool comp1 = AlphaCompare(alpha, bpmem.alpha_test.ref1, bpmem.alpha_test.comp1);
 
-    switch (bpmem.alpha_test.logic) {
+	switch (bpmem.alpha_test.logic)
+	{
 	case 0: return comp0 && comp1;   // and
 	case 1: return comp0 || comp1;   // or
 	case 2: return comp0 ^ comp1;    // xor
@@ -449,7 +450,8 @@ static bool TevAlphaTest(int alpha)
 
 inline s32 WrapIndirectCoord(s32 coord, int wrapMode)
 {
-    switch (wrapMode) {
+	switch (wrapMode)
+	{
 		case ITW_OFF:
 			return coord;
 		case ITW_256:
@@ -476,7 +478,8 @@ void Tev::Indirect(unsigned int stageNum, s32 s, s32 t)
 	s32 indcoord[3];
 
 	// alpha bump select
-    switch (indirect.bs) {
+	switch (indirect.bs)
+	{
 		case ITBA_OFF:
 			AlphaBump = 0;
 			break;
@@ -499,7 +502,8 @@ void Tev::Indirect(unsigned int stageNum, s32 s, s32 t)
 	bias[2] = indirect.bias&4?biasValue:0;
 
 	// format
-    switch(indirect.fmt) {
+	switch(indirect.fmt)
+	{
 		case ITF_8:
 			indcoord[0] = indmap[TextureSampler::ALP_SMP] + bias[0];
 			indcoord[1] = indmap[TextureSampler::BLU_SMP] + bias[1];
@@ -542,7 +546,8 @@ void Tev::Indirect(unsigned int stageNum, s32 s, s32 t)
 
 		int shift;
 
-        switch (indirect.mid & 12) {
+		switch (indirect.mid & 12)
+		{
 			case 0:
 				shift = 3 + (17 - scale);
 				indtevtrans[0] = indmtx.col0.ma * indcoord[0] + indmtx.col1.mc * indcoord[1] + indmtx.col2.me * indcoord[2];
@@ -713,7 +718,8 @@ void Tev::Draw()
 	if (bpmem.ztex2.op)
 	{
 		u32 ztex = bpmem.ztex1.bias;
-        switch (bpmem.ztex2.type) {
+		switch (bpmem.ztex2.type)
+		{
 			case 0: // 8 bit
 				ztex += TexColor[ALP_C];
 				break;

Source/Plugins/Plugin_VideoSoftware/Src/Tev.h

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #ifndef _TEV_H_
@@ -23,7 +23,8 @@
 
 class Tev
 { 
-	struct InputRegType {
+	struct InputRegType
+	{
 		unsigned a : 8;
 		unsigned b : 8;
 		unsigned c : 8;

Source/Plugins/Plugin_VideoSoftware/Src/TextureEncoder.cpp

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #include "TextureEncoder.h"
@@ -57,8 +57,10 @@ inline void boxfilterRGBA_to_RGBA8(u8 *src, u8 &r, u8 &g, u8 &b, u8 &a)
 {
 	u16 r16 = 0, g16 = 0, b16 = 0, a16 = 0;
 
-    for (int y = 0; y < 2; y++) {
-        for (int x = 0; x < 2; x++) {
+	for (int y = 0; y < 2; y++)
+	{
+		for (int x = 0; x < 2; x++)
+		{
 			u32 srcColor = *(u32*)src;
 
 			a16 += srcColor & 0x3f;
@@ -81,8 +83,10 @@ inline void boxfilterRGBA_to_RGB8(u8 *src, u8 &r, u8 &g, u8 &b)
 {
 	u16 r16 = 0, g16 = 0, b16 = 0;
 
-    for (int y = 0; y < 2; y++) {
-        for (int x = 0; x < 2; x++) {
+	for (int y = 0; y < 2; y++)
+	{
+		for (int x = 0; x < 2; x++)
+		{
 			u32 srcColor = *(u32*)src;
 
 			b16 += (srcColor >> 6) & 0x3f;
@@ -103,8 +107,10 @@ inline void boxfilterRGBA_to_x8(u8 *src, u8 &x8, int shift)
 {
 	u16 x16 = 0;
 
-    for (int y = 0; y < 2; y++) {
-        for (int x = 0; x < 2; x++) {
+	for (int y = 0; y < 2; y++)
+	{
+		for (int x = 0; x < 2; x++)
+		{
 			u32 srcColor = *(u32*)src;
 
 			x16 += (srcColor >> shift) & 0x3f;
@@ -122,8 +128,10 @@ inline void boxfilterRGBA_to_xx8(u8 *src, u8 &x1, u8 &x2, int shift1, int shift2
 	u16 x16_1 = 0;
 	u16 x16_2 = 0;
 
-    for (int y = 0; y < 2; y++) {
-        for (int x = 0; x < 2; x++) {
+	for (int y = 0; y < 2; y++)
+	{
+		for (int x = 0; x < 2; x++)
+		{
 			u32 srcColor = *(u32*)src;
 
 			x16_1 += (srcColor >> shift1) & 0x3f;
@@ -142,9 +150,10 @@ inline void boxfilterRGB_to_RGB8(u8 *src, u8 &r, u8 &g, u8 &b)
 {
 	u16 r16 = 0, g16 = 0, b16 = 0;
 
-    for (int y = 0; y < 2; y++) {
-        for (int x = 0; x < 2; x++) {
-
+	for (int y = 0; y < 2; y++)
+	{
+		for (int x = 0; x < 2; x++)
+		{
 			b16 += src[0];
 			g16 += src[1];
 			r16 += src[2];
@@ -163,8 +172,10 @@ inline void boxfilterRGB_to_x8(u8 *src, u8 &x8, int comp)
 {
 	u16 x16 = 0;
 
-    for (int y = 0; y < 2; y++) {
-        for (int x = 0; x < 2; x++) {
+	for (int y = 0; y < 2; y++)
+	{
+		for (int x = 0; x < 2; x++)
+		{
 
 			x16 += src[comp];
 
@@ -181,8 +192,10 @@ inline void boxfilterRGB_to_xx8(u8 *src, u8 &x1, u8 &x2, int comp1, int comp2)
 	u16 x16_1 = 0;
 	u16 x16_2 = 0;
 
-    for (int y = 0; y < 2; y++) {
-        for (int x = 0; x < 2; x++) {
+	for (int y = 0; y < 2; y++)
+	{
+		for (int x = 0; x < 2; x++)
+		{
 
 			x16_1 += src[comp1];
 			x16_2 += src[comp2];

Source/Plugins/Plugin_VideoSoftware/Src/TextureEncoder.h

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 

Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.cpp

@@ -11,7 +11,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 

Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.h

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #ifndef _TEXTURESAMPLER_H_

Source/Plugins/Plugin_VideoSoftware/Src/TransformUnit.cpp

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #include "Common.h"
@@ -222,16 +222,18 @@ inline float Clamp(float val, float a, float b)
 
 inline float SafeDivide(float n, float d)
 {
-    return (d==0)?(n>0?1:0):n/d;
+	return (d==0) ? (n>0?1:0) : n/d;
 }
 
 void LightColor(const Vec3 &pos, const Vec3 &normal, u8 lightNum, const LitChannel &chan, Vec3 &lightCol)
 {
 	const LightPointer *light = (const LightPointer*)&swxfregs.lights[0x10*lightNum];
 
-    if (!(chan.attnfunc & 1)) {
+	if (!(chan.attnfunc & 1))
+	{
 		// atten disabled
-        switch (chan.diffusefunc) {
+		switch (chan.diffusefunc)
+		{
 			case LIGHTDIF_NONE:
 				AddIntegerColor(light->color, lightCol);
 				break;
@@ -252,12 +254,14 @@ void LightColor(const Vec3 &pos, const Vec3 &normal, u8 lightNum, const LitChann
 			default: _assert_(0);
 		}
 	}
-    else { // spec and spot
+	else // spec and spot
+	{
 		// not sure about divide by zero checks
 		Vec3 ldir = light->pos - pos;
 		float attn;
 
-        if (chan.attnfunc == 3) { // spot
+		if (chan.attnfunc == 3) // spot
+		{ 
 			float dist2 = ldir.length2();
 			float dist = sqrtf(dist2);
 			ldir = ldir / dist;
@@ -267,7 +271,8 @@ void LightColor(const Vec3 &pos, const Vec3 &normal, u8 lightNum, const LitChann
 			float distAtt = light->distatt.x + (light->distatt.y * dist) + (light->distatt.z * dist2);
 			attn = SafeDivide(max(0.0f, cosAtt), distAtt);
 		}
-        else if (chan.attnfunc == 1) { // specular
+		else if (chan.attnfunc == 1) // specular
+		{ 
 			// donko - what is going on here?  655.36 is a guess but seems about right.
 			attn = (light->pos * normal) > -655.36 ? max(0.0f, (light->dir * normal)) : 0;
 			ldir.set(1.0f, attn, attn * attn);
@@ -275,12 +280,15 @@ void LightColor(const Vec3 &pos, const Vec3 &normal, u8 lightNum, const LitChann
 			float cosAtt = max(0.0f, light->cosatt * ldir);
 			float distAtt = light->distatt * ldir;
 			attn = SafeDivide(max(0.0f, cosAtt), distAtt);
-        } else {
+		}
+		else
+		{
 			PanicAlert("LightColor");
 			return;
 		}
 
-        switch (chan.diffusefunc) {
+		switch (chan.diffusefunc)
+		{
 			case LIGHTDIF_NONE:
 				AddScaledIntegerColor(light->color, attn, lightCol);
 				break;
@@ -306,9 +314,11 @@ void LightAlpha(const Vec3 &pos, const Vec3 &normal, u8 lightNum, const LitChann
 {
 	const LightPointer *light = (const LightPointer*)&swxfregs.lights[0x10*lightNum];
 
-    if (!(chan.attnfunc & 1)) {
+	if (!(chan.attnfunc & 1))
+	{
 		// atten disabled
-        switch (chan.diffusefunc) {
+		switch (chan.diffusefunc)
+		{
 			case LIGHTDIF_NONE:
 				lightCol += light->color[0];
 				break;
@@ -329,11 +339,13 @@ void LightAlpha(const Vec3 &pos, const Vec3 &normal, u8 lightNum, const LitChann
 			default: _assert_(0);
 		}
 	}
-    else { // spec and spot
+	else // spec and spot
+	{
 		Vec3 ldir = light->pos - pos;
 		float attn;
 
-        if (chan.attnfunc == 3) { // spot
+		if (chan.attnfunc == 3) // spot
+		{
 			float dist2 = ldir.length2();
 			float dist = sqrtf(dist2);
 			ldir = ldir / dist;
@@ -343,7 +355,8 @@ void LightAlpha(const Vec3 &pos, const Vec3 &normal, u8 lightNum, const LitChann
 			float distAtt = light->distatt.x + (light->distatt.y * dist) + (light->distatt.z * dist2);
 			attn = SafeDivide(max(0.0f, cosAtt), distAtt);
 		}
-        else /* if (chan.attnfunc == 1) */ { // specular
+		else /* if (chan.attnfunc == 1) */ // specular
+		{
 			// donko - what is going on here?  655.36 is a guess but seems about right.
 			attn = (light->pos * normal) > -655.36 ? max(0.0f, (light->dir * normal)) : 0;
 			ldir.set(1.0f, attn, attn * attn);
@@ -353,7 +366,8 @@ void LightAlpha(const Vec3 &pos, const Vec3 &normal, u8 lightNum, const LitChann
 			attn = SafeDivide(max(0.0f, cosAtt), distAtt);
 		}
 
-        switch (chan.diffusefunc) {
+		switch (chan.diffusefunc)
+		{
 			case LIGHTDIF_NONE:
 				lightCol += light->color[0] * attn;
 				break;
@@ -409,7 +423,8 @@ void TransformColor(const InputVertexData *src, OutputVertexData *dst)
 			}
 
 			u8 mask = colorchan.GetFullLightMask();
-            for (int i = 0; i < 8; ++i) {
+			for (int i = 0; i < 8; ++i)
+			{
 				if (mask&(1<<i))
 					LightColor(dst->mvPosition, dst->normal[0], i, colorchan, lightCol);
 			}
@@ -440,7 +455,8 @@ void TransformColor(const InputVertexData *src, OutputVertexData *dst)
 				lightCol = (float)(swxfregs.ambColor[chan] & 0xff);
 
 			u8 mask = alphachan.GetFullLightMask();
-            for (int i = 0; i < 8; ++i) {
+			for (int i = 0; i < 8; ++i)
+			{
 				if (mask&(1<<i))
 					LightAlpha(dst->mvPosition, dst->normal[0], i, alphachan, lightCol);
 			}

Source/Plugins/Plugin_VideoSoftware/Src/TransformUnit.h

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #ifndef _TRANSFORM_UNIT_H_

Source/Plugins/Plugin_VideoSoftware/Src/Vec3.h

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #ifndef _VEC3_H

Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #include "VideoConfigDiag.h"

Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.h

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #ifndef _VIDEOSOFTWARE_CONFIG_DIAG_H_

Source/Plugins/Plugin_VideoSoftware/Src/XFMemLoader.cpp

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #include "VideoCommon.h"
@@ -76,11 +76,11 @@ void SWLoadXFReg(u32 transferSize, u32 baseAddress, u32 *pData)
 			size = 0x1058 - baseAddress;
 	}
 
-    if (size > 0) {
+	if (size > 0)
+	{
 		memcpy_gc( &((u32*)&swxfregs)[baseAddress], pData, size * 4);
 		XFWritten(transferSize, baseAddress);
 	}
-
 }
 
 void SWLoadIndexedXF(u32 val, int array)

Source/Plugins/Plugin_VideoSoftware/Src/XFMemLoader.h

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #ifndef _XFMEMLOADER_H_

Source/Plugins/Plugin_VideoSoftware/Src/stdafx.cpp

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #include "stdafx.h"

Source/Plugins/Plugin_VideoSoftware/Src/stdafx.h

@@ -12,7 +12,7 @@
 // A copy of the GPL 2.0 should have been included with the program.
 // If not, see http://www.gnu.org/licenses/
 
-// Official SVN repository and contact information can be found at
+// Official Git repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
 #pragma once