Reformat all the things. Have fun with merge conflicts.

1 files changed, 105 insertions, 106 deletions

diff --git a/Source/Core/VideoBackends/Software/SetupUnit.cpp b/Source/Core/VideoBackends/Software/SetupUnit.cpp
index a9ef985963..78e331e15a 100644
--- a/Source/Core/VideoBackends/Software/SetupUnit.cpp
+++ b/Source/Core/VideoBackends/Software/SetupUnit.cpp
@@ -2,166 +2,165 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "VideoBackends/Software/SetupUnit.h"
 #include "Common/ChunkFile.h"
 #include "VideoBackends/Software/Clipper.h"
-#include "VideoBackends/Software/SetupUnit.h"
 
 #include "VideoCommon/OpcodeDecoding.h"
 
 void SetupUnit::Init(u8 primitiveType)
 {
-	m_PrimType = primitiveType;
+  m_PrimType = primitiveType;
 
-	m_VertexCounter = 0;
-	m_VertPointer[0] = &m_Vertices[0];
-	m_VertPointer[1] = &m_Vertices[1];
-	m_VertPointer[2] = &m_Vertices[2];
-	m_VertWritePointer = m_VertPointer[0];
+  m_VertexCounter = 0;
+  m_VertPointer[0] = &m_Vertices[0];
+  m_VertPointer[1] = &m_Vertices[1];
+  m_VertPointer[2] = &m_Vertices[2];
+  m_VertWritePointer = m_VertPointer[0];
 }
 
 OutputVertexData* SetupUnit::GetVertex()
 {
-	memset(m_VertWritePointer, 0, sizeof(*m_VertWritePointer));
-	return m_VertWritePointer;
+  memset(m_VertWritePointer, 0, sizeof(*m_VertWritePointer));
+  return m_VertWritePointer;
 }
 
 void SetupUnit::SetupVertex()
 {
-	switch (m_PrimType)
-	{
-	case GX_DRAW_QUADS:
-		SetupQuad();
-		break;
-	case GX_DRAW_QUADS_2:
-		WARN_LOG(VIDEO, "Non-standard primitive drawing command GL_DRAW_QUADS_2");
-		SetupQuad();
-		break;
-	case GX_DRAW_TRIANGLES:
-		SetupTriangle();
-		break;
-	case GX_DRAW_TRIANGLE_STRIP:
-		SetupTriStrip();
-		break;
-	case GX_DRAW_TRIANGLE_FAN:
-		SetupTriFan();
-		break;
-	case GX_DRAW_LINES:
-		SetupLine();
-		break;
-	case GX_DRAW_LINE_STRIP:
-		SetupLineStrip();
-		break;
-	case GX_DRAW_POINTS:
-		SetupPoint();
-		break;
-	}
+  switch (m_PrimType)
+  {
+  case GX_DRAW_QUADS:
+    SetupQuad();
+    break;
+  case GX_DRAW_QUADS_2:
+    WARN_LOG(VIDEO, "Non-standard primitive drawing command GL_DRAW_QUADS_2");
+    SetupQuad();
+    break;
+  case GX_DRAW_TRIANGLES:
+    SetupTriangle();
+    break;
+  case GX_DRAW_TRIANGLE_STRIP:
+    SetupTriStrip();
+    break;
+  case GX_DRAW_TRIANGLE_FAN:
+    SetupTriFan();
+    break;
+  case GX_DRAW_LINES:
+    SetupLine();
+    break;
+  case GX_DRAW_LINE_STRIP:
+    SetupLineStrip();
+    break;
+  case GX_DRAW_POINTS:
+    SetupPoint();
+    break;
+  }
 }
 
-
 void SetupUnit::SetupQuad()
 {
-	if (m_VertexCounter < 2)
-	{
-		m_VertexCounter++;
-		m_VertWritePointer = m_VertPointer[m_VertexCounter];
-		return;
-	}
-
-	Clipper::ProcessTriangle(m_VertPointer[0], m_VertPointer[1], m_VertPointer[2]);
-
-	m_VertexCounter++;
-	m_VertexCounter &= 3;
-	m_VertWritePointer = &m_Vertices[m_VertexCounter & 1];
-	OutputVertexData* temp = m_VertPointer[1];
-	m_VertPointer[1] = m_VertPointer[2];
-	m_VertPointer[2] = temp;
+  if (m_VertexCounter < 2)
+  {
+    m_VertexCounter++;
+    m_VertWritePointer = m_VertPointer[m_VertexCounter];
+    return;
+  }
+
+  Clipper::ProcessTriangle(m_VertPointer[0], m_VertPointer[1], m_VertPointer[2]);
+
+  m_VertexCounter++;
+  m_VertexCounter &= 3;
+  m_VertWritePointer = &m_Vertices[m_VertexCounter & 1];
+  OutputVertexData* temp = m_VertPointer[1];
+  m_VertPointer[1] = m_VertPointer[2];
+  m_VertPointer[2] = temp;
 }
 
 void SetupUnit::SetupTriangle()
 {
-	if (m_VertexCounter < 2)
-	{
-		m_VertexCounter++;
-		m_VertWritePointer = m_VertPointer[m_VertexCounter];
-		return;
-	}
+  if (m_VertexCounter < 2)
+  {
+    m_VertexCounter++;
+    m_VertWritePointer = m_VertPointer[m_VertexCounter];
+    return;
+  }
 
-	Clipper::ProcessTriangle(m_VertPointer[0], m_VertPointer[1], m_VertPointer[2]);
+  Clipper::ProcessTriangle(m_VertPointer[0], m_VertPointer[1], m_VertPointer[2]);
 
-	m_VertexCounter = 0;
-	m_VertWritePointer = m_VertPointer[0];
+  m_VertexCounter = 0;
+  m_VertWritePointer = m_VertPointer[0];
 }
 
 void SetupUnit::SetupTriStrip()
 {
-	if (m_VertexCounter < 2)
-	{
-		m_VertexCounter++;
-		m_VertWritePointer = m_VertPointer[m_VertexCounter];
-		return;
-	}
+  if (m_VertexCounter < 2)
+  {
+    m_VertexCounter++;
+    m_VertWritePointer = m_VertPointer[m_VertexCounter];
+    return;
+  }
 
-	Clipper::ProcessTriangle(m_VertPointer[0], m_VertPointer[1], m_VertPointer[2]);
+  Clipper::ProcessTriangle(m_VertPointer[0], m_VertPointer[1], m_VertPointer[2]);
 
-	m_VertexCounter++;
-	m_VertPointer[2 - (m_VertexCounter & 1)] = m_VertPointer[0];
-	m_VertWritePointer = m_VertPointer[0];
+  m_VertexCounter++;
+  m_VertPointer[2 - (m_VertexCounter & 1)] = m_VertPointer[0];
+  m_VertWritePointer = m_VertPointer[0];
 
-	m_VertPointer[0] = &m_Vertices[(m_VertexCounter + 1) % 3];
+  m_VertPointer[0] = &m_Vertices[(m_VertexCounter + 1) % 3];
 }
 
 void SetupUnit::SetupTriFan()
 {
-	if (m_VertexCounter < 2)
-	{
-		m_VertexCounter++;
-		m_VertWritePointer = m_VertPointer[m_VertexCounter];
-		return;
-	}
+  if (m_VertexCounter < 2)
+  {
+    m_VertexCounter++;
+    m_VertWritePointer = m_VertPointer[m_VertexCounter];
+    return;
+  }
 
-	Clipper::ProcessTriangle(m_VertPointer[0], m_VertPointer[1], m_VertPointer[2]);
+  Clipper::ProcessTriangle(m_VertPointer[0], m_VertPointer[1], m_VertPointer[2]);
 
-	m_VertexCounter++;
-	m_VertPointer[1] = m_VertPointer[2];
-	m_VertPointer[2] = &m_Vertices[2 - (m_VertexCounter & 1)];
+  m_VertexCounter++;
+  m_VertPointer[1] = m_VertPointer[2];
+  m_VertPointer[2] = &m_Vertices[2 - (m_VertexCounter & 1)];
 
-	m_VertWritePointer = m_VertPointer[2];
+  m_VertWritePointer = m_VertPointer[2];
 }
 
 void SetupUnit::SetupLine()
 {
-	if (m_VertexCounter < 1)
-	{
-		m_VertexCounter++;
-		m_VertWritePointer = m_VertPointer[m_VertexCounter];
-		return;
-	}
+  if (m_VertexCounter < 1)
+  {
+    m_VertexCounter++;
+    m_VertWritePointer = m_VertPointer[m_VertexCounter];
+    return;
+  }
 
-	Clipper::ProcessLine(m_VertPointer[0], m_VertPointer[1]);
+  Clipper::ProcessLine(m_VertPointer[0], m_VertPointer[1]);
 
-	m_VertexCounter = 0;
-	m_VertWritePointer = m_VertPointer[0];
+  m_VertexCounter = 0;
+  m_VertWritePointer = m_VertPointer[0];
 }
 
 void SetupUnit::SetupLineStrip()
 {
-	if (m_VertexCounter < 1)
-	{
-		m_VertexCounter++;
-		m_VertWritePointer = m_VertPointer[m_VertexCounter];
-		return;
-	}
+  if (m_VertexCounter < 1)
+  {
+    m_VertexCounter++;
+    m_VertWritePointer = m_VertPointer[m_VertexCounter];
+    return;
+  }
 
-	m_VertexCounter++;
+  m_VertexCounter++;
 
-	Clipper::ProcessLine(m_VertPointer[0], m_VertPointer[1]);
+  Clipper::ProcessLine(m_VertPointer[0], m_VertPointer[1]);
 
-	m_VertWritePointer = m_VertPointer[0];
+  m_VertWritePointer = m_VertPointer[0];
 
-	m_VertPointer[0] = m_VertPointer[1];
-	m_VertPointer[1] = &m_Vertices[m_VertexCounter & 1];
+  m_VertPointer[0] = m_VertPointer[1];
+  m_VertPointer[1] = &m_Vertices[m_VertexCounter & 1];
 }
 
 void SetupUnit::SetupPoint()
-{}
-
+{
+}