Some cleanup, extracted XFB convert code into VideoCommon, added non-activated support to gl plugin. + a minor bugfix with no effects seen so far in gl plugin :P

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@209 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Core/Common/Src/Common.h

@@ -117,62 +117,21 @@ typedef union _LARGE_INTEGER
 
 #endif
 
-#if !defined (_MSC_VER) && !defined (HAVE_ALIGNED_MALLOC)
-
-// declare linux equivalents
-extern __forceinline void* gc_aligned_malloc(size_t size, size_t align)
-{
-	char* p = (char*)malloc(size + align);
-	int off = 2 + align - ((s64)(p + 2) % align);
-
-	p += off;
-	*(u16*)(p - 2) = off;
-
-	return(p);
-}
-
-
-extern __forceinline void gc_aligned_free(void* pmem)
-{
-	if (pmem != NULL)
-	{
-		char* p = (char*)pmem;
-		free(p - (int)*(u16*)(p - 2));
-	}
-}
-
-
-#define _aligned_malloc gc_aligned_malloc
-#define _aligned_free gc_aligned_free
-
-#endif
-
 #if defined (_M_IX86) && defined (_WIN32)
 #define HWCALL __cdecl
 #else
 #define HWCALL
 #endif
 
-
-// Hacks
-#ifndef SAFE_DELETE
-#define SAFE_DELETE(ptr) if (ptr){delete ptr; ptr = 0;}
-#endif
-
-// Common defines
-// TODO(ector,fires): turn into inline function?
 #undef min
 #undef max
 
 template<class T>
-T min(const T& a, const T& b) {return(a > b ? b : a);}
+inline T min(const T& a, const T& b) {return(a > b ? b : a);}
 
 
 template<class T>
-T max(const T& a, const T& b) {return(a > b ? a : b);}
-
-
-
+inline T max(const T& a, const T& b) {return(a > b ? a : b);}
 
 // Byte ordering
 
@@ -183,39 +142,25 @@ inline u8 swap8(u8 _data) {return(_data);}
 
 #ifdef _WIN32
 inline u16 swap16(u16 _data) {return(_byteswap_ushort(_data));}
-
-
 inline u32 swap32(u32 _data) {return(_byteswap_ulong(_data));}
-
-
 inline u64 swap64(u64 _data) {return(_byteswap_uint64(_data));}
 
-
 #elif __linux__
 }
 #include <byteswap.h>
 namespace Common
 {
 inline u16 swap16(u16 _data) {return(bswap_16(_data));}
-
-
 inline u32 swap32(u32 _data) {return(bswap_32(_data));}
-
-
 inline u64 swap64(u64 _data) {return(bswap_64(_data));}
 
 
 #else
 inline u16 swap16(u16 data) {return((data >> 8) | (data << 8));}
-
-
 inline u32 swap32(u32 data) {return((swap16(data) << 16) | swap16(data >> 16));}
-
-
 inline u64 swap64(u64 data) {return(((u64)swap32(data) << 32) | swap32(data >> 32));}
 #endif
 
-
 } // end of namespace Common
 
 // Utility functions
@@ -231,36 +176,35 @@ extern void __Log(int logNumber, const char* text, ...);
 class LogTypes
 {
 	public:
-
-		enum LOG_TYPE
-		{
-			MASTER_LOG,
-			BOOT,
-			PIXELENGINE,
-			COMMANDPROCESSOR,
-			VIDEOINTERFACE,
-			SERIALINTERFACE,
-			PERIPHERALINTERFACE,
-			MEMMAP,
-			DSPINTERFACE,
-			STREAMINGINTERFACE,
-			DVDINTERFACE,
-			GPFIFO,
-			EXPANSIONINTERFACE,
-			AUDIO_INTERFACE,
-			GEKKO,
-			HLE,
-			DSPHLE,
-			VIDEO,
-			AUDIO,
-			DYNA_REC,
-			OSREPORT,
-			CONSOLE,
-			WII_IOB,
-			WII_IPC,
-			WII_IPC_HLE,
-			NUMBER_OF_LOGS
-		};
+	enum LOG_TYPE
+	{
+		MASTER_LOG,
+		BOOT,
+		PIXELENGINE,
+		COMMANDPROCESSOR,
+		VIDEOINTERFACE,
+		SERIALINTERFACE,
+		PERIPHERALINTERFACE,
+		MEMMAP,
+		DSPINTERFACE,
+		STREAMINGINTERFACE,
+		DVDINTERFACE,
+		GPFIFO,
+		EXPANSIONINTERFACE,
+		AUDIO_INTERFACE,
+		GEKKO,
+		HLE,
+		DSPHLE,
+		VIDEO,
+		AUDIO,
+		DYNA_REC,
+		OSREPORT,
+		CONSOLE,
+		WII_IOB,
+		WII_IPC,
+		WII_IPC_HLE,
+		NUMBER_OF_LOGS
+	};
 };
 
 typedef bool (*PanicAlertHandler)(const char* text, bool yes_no);
@@ -268,7 +212,6 @@ void RegisterPanicAlertHandler(PanicAlertHandler handler);
 
 void Host_UpdateLogDisplay();
 
-
 // Logging macros
 #ifdef LOGGING
 
@@ -297,7 +240,6 @@ void Host_UpdateLogDisplay();
 
 #endif
 
-
 #ifdef _WIN32
 #define _assert_(_a_) _dbg_assert_(MASTER_LOG, _a_)
 #define _assert_msg_(_t_, _a_, _fmt_, ...)\

Source/Core/VideoCommon/Src/SConscript

@@ -5,6 +5,7 @@ files = ["BPMemory.cpp",
 		 "LookUpTables.cpp",
 		 "TextureDecoder.cpp",
 		 "XFMemory.cpp",
+		 "XFBConvert.cpp",
 		 ]
 
 env_common = env.Copy(CXXFLAGS = " -fPIC ")

Source/Core/VideoCommon/Src/XFBConvert.cpp

@@ -0,0 +1,59 @@
+// Copyright (C) 2003-2008 Dolphin Project.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, version 2.0.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License 2.0 for more details.
+
+// 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
+// http://code.google.com/p/dolphin-emu/
+
+#include "XFBConvert.h"
+#include "Common.h"
+
+// TODO: Convert this thing into wicked fast SSE2.
+
+namespace {
+
+int bound(int i)
+{
+	return (i>255)?255:((i<0)?0:i);
+}
+
+void yuv2rgb(int y, int u, int v, int &r, int &g, int &b)
+{
+	b = bound((76283*(y - 16) + 132252*(u - 128))>>16);
+	g = bound((76283*(y - 16) - 53281 *(v - 128) - 25624*(u - 128))>>16); //last one u?
+	r = bound((76283*(y - 16) + 104595*(v - 128))>>16);
+}
+
+}  // namespace
+
+void ConvertXFB(u32 *dst, const u8* _pXFB, int width, int height)
+{
+	const unsigned char *src = _pXFB;
+	for (int y = 0; y < height; y++)
+	{
+		for (int x = 0; x < width; x++, src += 4)
+		{
+			int Y1 = src[0];
+			int U  = src[1];
+			int Y2 = src[2];
+			int V  = src[3];
+
+			int r, g, b;
+			yuv2rgb(Y1,U,V, r,g,b);
+			*dst++ = 0xFF000000 | (r<<16) | (g<<8) | (b);
+			yuv2rgb(Y2,U,V, r,g,b);
+			*dst++ = 0xFF000000 | (r<<16) | (g<<8) | (b);
+		}
+	}
+}
+

Source/Core/VideoCommon/Src/XFBConvert.h

@@ -0,0 +1,25 @@
+// Copyright (C) 2003-2008 Dolphin Project.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, version 2.0.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License 2.0 for more details.
+
+// 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
+// http://code.google.com/p/dolphin-emu/
+
+#ifndef _XFB_CONVERT
+#define _XFB_CONVERT
+
+#include "Common.h"
+
+void ConvertXFB(u32 *dst, const u8* _pXFB, int width, int height);
+
+#endif

Source/Core/VideoCommon/VideoCommon.vcproj

@@ -413,6 +413,10 @@
 			RelativePath=".\Src\LookUpTables.h"
 			>
 		</File>
+		<File
+			RelativePath=".\Src\SConscript"
+			>
+		</File>
 		<File
 			RelativePath=".\Src\TextureDecoder.cpp"
 			>
@@ -421,6 +425,14 @@
 			RelativePath=".\Src\TextureDecoder.h"
 			>
 		</File>
+		<File
+			RelativePath=".\Src\XFBConvert.cpp"
+			>
+		</File>
+		<File
+			RelativePath=".\Src\XFBConvert.h"
+			>
+		</File>
 		<File
 			RelativePath=".\Src\XFMemory.cpp"
 			>