Big-endian compat (#37)

jorio · May 21, 2023 · 0d997af · 0d997af
1 parent 6c2a90f
commit 0d997af
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 2 deletions.
diff --git a/src/QD3D/QD3D_Support.c b/src/QD3D/QD3D_Support.c
@@ -561,7 +561,11 @@ void MakeShadowTexture(void)
 			width,
 			height,
 			GL_BGRA,
+#if !(__BIG_ENDIAN__)
 			GL_UNSIGNED_INT_8_8_8_8,
+#else
+			GL_UNSIGNED_INT_8_8_8_8_REV,
+#endif
 			pixelData,
 			0
 			);

diff --git a/src/QD3D/Renderer.c b/src/QD3D/Renderer.c
@@ -872,7 +872,11 @@ void Render_AllocBackdrop(int width, int height)
 			width,
 			height,
 			GL_BGRA,
+#if !(__BIG_ENDIAN__)
 			GL_UNSIGNED_INT_8_8_8_8,
+#else
+			GL_UNSIGNED_INT_8_8_8_8_REV,
+#endif
 			gBackdropPixels,
 			kRendererTextureFlags_ClampBoth
 	);
@@ -937,7 +941,11 @@ void Render_DrawBackdrop(bool keepBackdropAspectRatio)
 				damageRect.right - damageRect.left,
 				damageRect.bottom - damageRect.top,
 				GL_BGRA,
+#if !(__BIG_ENDIAN__)
 				GL_UNSIGNED_INT_8_8_8_8,
+#else
+				GL_UNSIGNED_INT_8_8_8_8_REV,
+#endif
 				gBackdropPixels + (damageRect.top * gBackdropWidth + damageRect.left));
 		CHECK_GL_ERROR();
 

diff --git a/src/Screens/Infobar.c b/src/Screens/Infobar.c
@@ -593,7 +593,11 @@ static TQ3Point3D				points[4] = { { -GPS_DISPLAY_SIZE,  GPS_DISPLAY_SIZE, 0 },
 			GPS_MAP_TEXTURE_SIZE,
 			GPS_MAP_TEXTURE_SIZE,
 			GL_BGRA,
+#if !(__BIG_ENDIAN__)
 			GL_UNSIGNED_INT_8_8_8_8,
+#else
+			GL_UNSIGNED_INT_8_8_8_8_REV,
+#endif
 			GetPixBaseAddr(GetGWorldPixMap(gGPSGWorld)),
 			kRendererTextureFlags_ClampBoth);
 	mesh->glTextureName = textureName;
@@ -776,7 +780,11 @@ Boolean					forceUpdate = false;
 				GPS_MAP_TEXTURE_SIZE,
 				GPS_MAP_TEXTURE_SIZE,
 				GL_BGRA,
+#if !(__BIG_ENDIAN__)
 				GL_UNSIGNED_INT_8_8_8_8,
+#else
+				GL_UNSIGNED_INT_8_8_8_8_REV,
+#endif
 				GetPixBaseAddr(GetGWorldPixMap(gGPSGWorld)));
 		CHECK_GL_ERROR();
 

diff --git a/src/System/File.c b/src/System/File.c
@@ -205,8 +205,10 @@ SkeletonFile_AnimHeader_Type	*animHeaderPtr;
 		GAME_ASSERT(hand);
 		HLock(hand);
 		indexPtr = (UInt16 *) *hand;
+#if !(__BIG_ENDIAN__)
 		ByteswapInts(sizeof(UInt16), skeleton->Bones[i].numPointsAttachedToBone, indexPtr);
-
+#endif
+
 
 			/* COPY POINT INDEX ARRAY INTO BONE STRUCT */
 
@@ -221,8 +223,10 @@ SkeletonFile_AnimHeader_Type	*animHeaderPtr;
 		GAME_ASSERT(hand);
 		HLock(hand);
 		indexPtr = (UInt16 *) *hand;
+#if !(__BIG_ENDIAN__)
 		ByteswapInts(sizeof(UInt16), skeleton->Bones[i].numNormalsAttachedToBone, indexPtr);
-
+#endif
+
 			/* COPY NORMAL INDEX ARRAY INTO BONE STRUCT */
 
 		for (int j = 0; j < skeleton->Bones[i].numNormalsAttachedToBone; j++)
@@ -563,7 +567,9 @@ long		fileSize;
 	int numTexels = gNumTerrainTextureTiles * OREOMAP_TILE_SIZE * OREOMAP_TILE_SIZE;
 	GAME_ASSERT(numTexels*2 == fileSize-4);
 
+#if !(__BIG_ENDIAN__)
 	ByteswapInts(sizeof(UInt16), numTexels, gTileDataPtr);
+#endif
 }
 
 
@@ -627,7 +633,9 @@ int			dummy1,dummy2;
 
 	offset = *((SInt32 *)(gTerrainPtr+0));										// get offset to TEXTURE_LAYER
 	shortPtr = (UInt16 *)(gTerrainPtr + offset);								// calc ptr to TEXTURE_LAYER
+#if !(__BIG_ENDIAN__)
 	ByteswapInts(sizeof(UInt16), gTerrainTileDepth * gTerrainTileWidth, shortPtr);
+#endif
 
 	for (int row = 0; row < gTerrainTileDepth; row++)
 	{
@@ -645,7 +653,9 @@ int			dummy1,dummy2;
 	if (offset > 0)
 	{
 		shortPtr = (UInt16 *)(gTerrainPtr + offset);							// calc ptr to HEIGHTMAP_LAYER
+#if !(__BIG_ENDIAN__)
 		ByteswapInts(sizeof(UInt16), gTerrainTileDepth * gTerrainTileWidth, shortPtr);
+#endif
 
 		for (int row = 0; row < gTerrainTileDepth; row++)
 		{
@@ -664,7 +674,9 @@ int			dummy1,dummy2;
 	if (offset > 0)
 	{
 		shortPtr = (UInt16 *)(gTerrainPtr + offset);							// calc ptr to PATH_LAYER
+#if !(__BIG_ENDIAN__)
 		ByteswapInts(sizeof(UInt16), gTerrainTileDepth * gTerrainTileWidth, shortPtr);
+#endif
 
 		for (int row = 0; row < gTerrainTileDepth; row++)
 		{

diff --git a/src/System/TGA.c b/src/System/TGA.c
@@ -216,6 +216,9 @@ OSErr ReadTGA(const FSSpec* spec, uint8_t** outPtr, TGAHeader* outHeader, bool f
 		return err;
 	}
 
+	// Byteswap little-endian header on big-endian systems
+	UnpackStructs("<8B4H2B", sizeof(TGAHeader), 1, &header);
+
 	// Make sure we support the format
 	switch (header.imageType)
 	{