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

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

1 files changed, 117 insertions, 111 deletions

diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.cpp
index 57fc57a906..f57ade63a6 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.cpp
+++ b/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"
@@ -46,57 +46,57 @@ int BufferBase[NumObjectBuffers];
 
 void Init()
 {
-    for (int i = 0; i < NumObjectBuffers; i++)
-    {
-        memset(ObjectBuffer[i], 0, sizeof(ObjectBuffer[i]));
-        DrawnToBuffer[i] = false;
-        ObjectBufferName[i] = 0;
+	for (int i = 0; i < NumObjectBuffers; i++)
+	{
+		memset(ObjectBuffer[i], 0, sizeof(ObjectBuffer[i]));
+		DrawnToBuffer[i] = false;
+		ObjectBufferName[i] = 0;
 		BufferBase[i] = 0;
-    }
+	}
 }
 
 void SaveTexture(const char* filename, u32 texmap, s32 mip)
 {
-    FourTexUnits& texUnit = bpmem.tex[(texmap >> 2) & 1];
-    u8 subTexmap = texmap & 3;
+	FourTexUnits& texUnit = bpmem.tex[(texmap >> 2) & 1];
+	u8 subTexmap = texmap & 3;
 
-    TexImage0& ti0 = texUnit.texImage0[subTexmap];
+	TexImage0& ti0 = texUnit.texImage0[subTexmap];
 
 	u32 width = ti0.width + 1;
 	u32 height = ti0.height + 1;
 
 	u8 *data = new u8[width * height * 4];
-    
-    GetTextureBGRA(data, texmap, mip, width, height);
 
-    (void)SaveTGA(filename, width, height, data);
+	GetTextureBGRA(data, texmap, mip, width, height);
 
-    delete []data;
+	(void)SaveTGA(filename, width, height, data);
+
+	delete []data;
 }
 
 void GetTextureBGRA(u8 *dst, u32 texmap, s32 mip, u32 width, u32 height)
 {
-    u8 sample[4];    
+	u8 sample[4];
 
-    for (u32 y = 0; y < height; y++)
+	for (u32 y = 0; y < height; y++)
 	{
-        for (u32 x = 0; x < width; x++)
+		for (u32 x = 0; x < width; x++)
 		{
-            TextureSampler::SampleMip(x << 7, y << 7, mip, false, texmap, sample);
-            
+			TextureSampler::SampleMip(x << 7, y << 7, mip, false, texmap, sample);
+
 			// RGBA to BGRA
-            *(dst++) = sample[2];
-            *(dst++) = sample[1];
-            *(dst++) = sample[0];
-            *(dst++) = sample[3];
-        }
+			*(dst++) = sample[2];
+			*(dst++) = sample[1];
+			*(dst++) = sample[0];
+			*(dst++) = sample[3];
+		}
 	}
 }
 
 s32 GetMaxTextureLod(u32 texmap)
 {
 	FourTexUnits& texUnit = bpmem.tex[(texmap >> 2) & 1];
-    u8 subTexmap = texmap & 3;
+	u8 subTexmap = texmap & 3;
 
 	u8 maxLod = texUnit.texMode1[subTexmap].max_lod;
 	u8 mip = maxLod >> 4;
@@ -110,9 +110,9 @@ s32 GetMaxTextureLod(u32 texmap)
 
 void DumpActiveTextures()
 {
-    for (unsigned int stageNum = 0; stageNum < bpmem.genMode.numindstages; stageNum++)
-    {
-        u32 texmap = bpmem.tevindref.getTexMap(stageNum);
+	for (unsigned int stageNum = 0; stageNum < bpmem.genMode.numindstages; stageNum++)
+	{
+		u32 texmap = bpmem.tevindref.getTexMap(stageNum);
 
 		s32 maxLod = GetMaxTextureLod(texmap);
 		for (s32 mip = 0; mip <= maxLod; ++mip)
@@ -121,90 +121,96 @@ void DumpActiveTextures()
 						File::GetUserPath(D_DUMPTEXTURES_IDX).c_str(),
 						swstats.thisFrame.numDrawnObjects, stageNum, texmap, mip).c_str(), texmap, mip);
 		}
-    }
+	}
 
-    for (unsigned int stageNum = 0; stageNum <= bpmem.genMode.numtevstages; stageNum++)
-    {
-        int stageNum2 = stageNum >> 1;
-        int stageOdd = stageNum&1;
-        TwoTevStageOrders &order = bpmem.tevorders[stageNum2];
+	for (unsigned int stageNum = 0; stageNum <= bpmem.genMode.numtevstages; stageNum++)
+	{
+		int stageNum2 = stageNum >> 1;
+		int stageOdd = stageNum&1;
+		TwoTevStageOrders &order = bpmem.tevorders[stageNum2];
 
-        int texmap = order.getTexMap(stageOdd);
+		int texmap = order.getTexMap(stageOdd);
 
-        s32 maxLod = GetMaxTextureLod(texmap);
+		s32 maxLod = GetMaxTextureLod(texmap);
 		for (s32 mip = 0; mip <= maxLod; ++mip)
 		{
 			SaveTexture(StringFromFormat("%star%i_stage%i_map%i_mip%i.tga",
 						File::GetUserPath(D_DUMPTEXTURES_IDX).c_str(),
 						swstats.thisFrame.numDrawnObjects, stageNum, texmap, mip).c_str(), texmap, mip);
 		}
-    }
+	}
 }
 
 void DumpEfb(const char* filename)
 {
-    u8 *data = new u8[EFB_WIDTH * EFB_HEIGHT * 4];
-    u8 *writePtr = data;
-    u8 sample[4];    
-
-    for (int y = 0; y < EFB_HEIGHT; y++)
-        for (int x = 0; x < EFB_WIDTH; x++) {
-            EfbInterface::GetColor(x, y, sample);
-            // ABGR to BGRA
-            *(writePtr++) = sample[1];
-            *(writePtr++) = sample[2];
-            *(writePtr++) = sample[3];
-            *(writePtr++) = sample[0];
-        }
-
-    (void)SaveTGA(filename, EFB_WIDTH, EFB_HEIGHT, data);
-
-    delete []data;
+	u8 *data = new u8[EFB_WIDTH * EFB_HEIGHT * 4];
+	u8 *writePtr = data;
+	u8 sample[4];
+
+	for (int y = 0; y < EFB_HEIGHT; y++)
+	{
+		for (int x = 0; x < EFB_WIDTH; x++)
+		{
+			EfbInterface::GetColor(x, y, sample);
+			// ABGR to BGRA
+			*(writePtr++) = sample[1];
+			*(writePtr++) = sample[2];
+			*(writePtr++) = sample[3];
+			*(writePtr++) = sample[0];
+		}
+	}
+
+	(void)SaveTGA(filename, EFB_WIDTH, EFB_HEIGHT, data);
+
+	delete []data;
 }
 
 void DumpDepth(const char* filename)
 {
-    u8 *data = new u8[EFB_WIDTH * EFB_HEIGHT * 4];
-    u8 *writePtr = data;
-
-    for (int y = 0; y < EFB_HEIGHT; y++)
-        for (int x = 0; x < EFB_WIDTH; x++) {
-            u32 depth = EfbInterface::GetDepth(x, y);
-            // depth to bgra
-            *(writePtr++) = (depth >> 16) & 0xff;
-            *(writePtr++) = (depth >> 8) & 0xff;            
-            *(writePtr++) = depth & 0xff;
-            *(writePtr++) = 255;
-        }
-
-    (void)SaveTGA(filename, EFB_WIDTH, EFB_HEIGHT, data);
-
-    delete []data;
+	u8 *data = new u8[EFB_WIDTH * EFB_HEIGHT * 4];
+	u8 *writePtr = data;
+
+	for (int y = 0; y < EFB_HEIGHT; y++)
+	{
+		for (int x = 0; x < EFB_WIDTH; x++)
+		{
+			u32 depth = EfbInterface::GetDepth(x, y);
+			// depth to bgra
+			*(writePtr++) = (depth >> 16) & 0xff;
+			*(writePtr++) = (depth >> 8) & 0xff;
+			*(writePtr++) = depth & 0xff;
+			*(writePtr++) = 255;
+		}
+	}
+
+	(void)SaveTGA(filename, EFB_WIDTH, EFB_HEIGHT, data);
+
+	delete []data;
 }
 
 void DrawObjectBuffer(s16 x, s16 y, u8 *color, int bufferBase, int subBuffer, const char *name)
 {
-    int buffer = bufferBase + subBuffer;
+	int buffer = bufferBase + subBuffer;
 
 	u32 offset = (x + y * EFB_WIDTH) * 4;
-    u8 *dst = (u8*)&ObjectBuffer[buffer][offset];
-    *(dst++) = color[2];
-    *(dst++) = color[1];
-    *(dst++) = color[0];
-    *(dst++) = color[3];
-
-    DrawnToBuffer[buffer] = true;
-    ObjectBufferName[buffer] = name;
+	u8 *dst = (u8*)&ObjectBuffer[buffer][offset];
+	*(dst++) = color[2];
+	*(dst++) = color[1];
+	*(dst++) = color[0];
+	*(dst++) = color[3];
+
+	DrawnToBuffer[buffer] = true;
+	ObjectBufferName[buffer] = name;
 	BufferBase[buffer] = bufferBase;
 }
 
 void DrawTempBuffer(u8 *color, int buffer)
 {
 	u8 *dst = (u8*)&TempBuffer[buffer];
-    *(dst++) = color[2];
-    *(dst++) = color[1];
-    *(dst++) = color[0];
-    *(dst++) = color[3];
+	*(dst++) = color[2];
+	*(dst++) = color[1];
+	*(dst++) = color[0];
+	*(dst++) = color[3];
 }
 
 void CopyTempBuffer(s16 x, s16 y, int bufferBase, int subBuffer, const char *name)
@@ -215,69 +221,69 @@ void CopyTempBuffer(s16 x, s16 y, int bufferBase, int subBuffer, const char *nam
 	ObjectBuffer[buffer][offset] = TempBuffer[buffer];
 
 	DrawnToBuffer[buffer] = true;
-    ObjectBufferName[buffer] = name;
+	ObjectBufferName[buffer] = name;
 	BufferBase[buffer] = bufferBase;
 }
 
 void OnObjectBegin()
 {
-    if (!g_bSkipCurrentFrame)
-    {
-        if (g_SWVideoConfig.bDumpTextures && swstats.thisFrame.numDrawnObjects >= g_SWVideoConfig.drawStart && swstats.thisFrame.numDrawnObjects < g_SWVideoConfig.drawEnd)
-            DumpActiveTextures();
+	if (!g_bSkipCurrentFrame)
+	{
+		if (g_SWVideoConfig.bDumpTextures && swstats.thisFrame.numDrawnObjects >= g_SWVideoConfig.drawStart && swstats.thisFrame.numDrawnObjects < g_SWVideoConfig.drawEnd)
+			DumpActiveTextures();
 
-        if (g_SWVideoConfig.bHwRasterizer)
+		if (g_SWVideoConfig.bHwRasterizer)
 		{
-            HwRasterizer::BeginTriangles();
+			HwRasterizer::BeginTriangles();
 			drawingHwTriangles = true;
 		}
-    }
+	}
 }
 
 void OnObjectEnd()
 {
-    if (!g_bSkipCurrentFrame)
-    {
-        if (g_SWVideoConfig.bDumpObjects && swstats.thisFrame.numDrawnObjects >= g_SWVideoConfig.drawStart && swstats.thisFrame.numDrawnObjects < g_SWVideoConfig.drawEnd)
+	if (!g_bSkipCurrentFrame)
+	{
+		if (g_SWVideoConfig.bDumpObjects && swstats.thisFrame.numDrawnObjects >= g_SWVideoConfig.drawStart && swstats.thisFrame.numDrawnObjects < g_SWVideoConfig.drawEnd)
 			DumpEfb(StringFromFormat("%sobject%i.tga",
 						File::GetUserPath(D_DUMPFRAMES_IDX).c_str(),
 						swstats.thisFrame.numDrawnObjects).c_str());
 
-        if (g_SWVideoConfig.bHwRasterizer || drawingHwTriangles)
+		if (g_SWVideoConfig.bHwRasterizer || drawingHwTriangles)
 		{
-            HwRasterizer::EndTriangles();
+			HwRasterizer::EndTriangles();
 			drawingHwTriangles = false;
 		}
 
-        for (int i = 0; i < NumObjectBuffers; i++)
-        {
-            if (DrawnToBuffer[i])
-            {
-                DrawnToBuffer[i] = false;
+		for (int i = 0; i < NumObjectBuffers; i++)
+		{
+			if (DrawnToBuffer[i])
+			{
+				DrawnToBuffer[i] = false;
 				(void)SaveTGA(StringFromFormat("%sobject%i_%s(%i).tga",
 							File::GetUserPath(D_DUMPFRAMES_IDX).c_str(),
 							swstats.thisFrame.numDrawnObjects, ObjectBufferName[i], i - BufferBase[i]).c_str(),
 						EFB_WIDTH, EFB_HEIGHT, ObjectBuffer[i]);
 				memset(ObjectBuffer[i], 0, sizeof(ObjectBuffer[i]));
-            }
-        }
+			}
+		}
 
-        swstats.thisFrame.numDrawnObjects++;
-    }
+		swstats.thisFrame.numDrawnObjects++;
+	}
 }
 
 void OnFrameEnd()
 {
-    if (!g_bSkipCurrentFrame)
-    {
-        if (g_SWVideoConfig.bDumpFrames)
-        {
+	if (!g_bSkipCurrentFrame)
+	{
+		if (g_SWVideoConfig.bDumpFrames)
+		{
 			DumpEfb(StringFromFormat("%sframe%i_color.tga",
 						File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), swstats.frameCount).c_str());
 			DumpDepth(StringFromFormat("%sframe%i_depth.tga",
 						File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), swstats.frameCount).c_str());
-        }
-    }
+		}
+	}
 }
 
 }