From edbfe3f066999fc7be6e5f59bd5911cbbd5b8351 Mon Sep 17 00:00:00 2001
From: yabause <yabause@users.sf.net>
Date: Thu, 7 May 2009 23:49:03 +0000
Subject: [PATCH] More endian fixes. Now the first screen with 3D in SPP
 displays correctly.

---
 desmume/src/rasterize.cpp |  5 ++++-
 desmume/src/texcache.cpp  | 34 +++++++++++++++++++++++++++++++++-
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/desmume/src/rasterize.cpp b/desmume/src/rasterize.cpp
index f54938add..0bb667fb9 100644
--- a/desmume/src/rasterize.cpp
+++ b/desmume/src/rasterize.cpp
@@ -216,8 +216,11 @@ struct PolyAttr
 union FragmentColor {
 	u32 color;
 	struct {
-		//#ifdef WORDS_BIGENDIAN ?
+#ifdef WORDS_BIGENDIAN
+		u8 a,b,g,r;
+#else
 		u8 r,g,b,a;
+#endif
 	};
 };
 
diff --git a/desmume/src/texcache.cpp b/desmume/src/texcache.cpp
index 27765787c..c876c9d1d 100644
--- a/desmume/src/texcache.cpp
+++ b/desmume/src/texcache.cpp
@@ -74,6 +74,34 @@ public:
 		}
 		return done;
 	}
+
+	// this function does the same than dump
+	// but works for both little and big endian
+	// when buf is an u16 array
+	int dump16(void* buf, int size=-1)
+	{
+		if(size==-1) size = this->size;
+		size = min(this->size,size);
+		u16* bufptr = (u16*)buf;
+		int done = 0;
+		for(int i=0;i<numItems;i++)
+		{
+			Item item = items[i];
+			u8 * src = (u8 *) item.ptr;
+			int todo = min((int)item.len,size);
+			size -= todo;
+			done += todo;
+			for(int j = 0;j < todo / 2;j++)
+			{
+				u16 tmp;
+				tmp = *src++;
+				tmp |= *(src++) << 8;
+				*bufptr++ = tmp;
+			}
+			if(size==0) return done;
+		}
+		return done;
+	}
 };
 
 //creates a MemSpan in texture memory
@@ -218,7 +246,11 @@ void TexCache_SetTexture(u32 format, u32 texpal)
 	//dump the palette to a temp buffer, so that we don't have to worry about memory mapping.
 	//this isnt such a problem with texture memory, because we read sequentially from it.
 	//however, we read randomly from palette memory, so the mapping is more costly.
+#ifdef WORDS_BIGENDIAN
+	mspal.dump16(pal);
+#else
 	mspal.dump(pal);
+#endif
 
 
 	u32 tx=texcache_start;
@@ -615,4 +647,4 @@ void (*TexCache_BindTextureData)(u32 texnum, u8* data);
 
 //these templates needed to be instantiated manually
 template void TexCache_SetTexture<TexFormat_32bpp>(u32 format, u32 texpal);
-template void TexCache_SetTexture<TexFormat_15bpp>(u32 format, u32 texpal);
\ No newline at end of file
+template void TexCache_SetTexture<TexFormat_15bpp>(u32 format, u32 texpal);