[Scummvm-cvs-logs] SF.net SVN: scummvm:[41697] scummvm/branches/gsoc2009-16bit/graphics/ pixelformat.h

[upthorn at users.sourceforge.net]

Revision: 41697
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41697&view=rev
Author:   upthorn
Date:     2009-06-20 05:31:23 +0000 (Sat, 20 Jun 2009)

Log Message:
-----------
Factory constructors for ARGB BGR ABGR and BGRA pixel formats.

Modified Paths:
--------------
    scummvm/branches/gsoc2009-16bit/graphics/pixelformat.h

Modified: scummvm/branches/gsoc2009-16bit/graphics/pixelformat.h
===================================================================
--- scummvm/branches/gsoc2009-16bit/graphics/pixelformat.h	2009-06-20 05:23:09 UTC (rev 41696)
+++ scummvm/branches/gsoc2009-16bit/graphics/pixelformat.h	2009-06-20 05:31:23 UTC (rev 41697)
@@ -65,8 +65,6 @@
 	}
 
 	//"Factory" methods for convenience
-	//TODO: BGR support
-	//TODO: Specify alpha position
 	static inline PixelFormat createFormatCLUT8() { 
 		return PixelFormat(1,8,8,8,8,0,0,0,0);
 	}
@@ -75,24 +73,55 @@
 	static inline PixelFormat createFormatRGB555() {
 		return PixelFormat(2,3,3,3,8,10,5,0,0);
 	}
+	static inline PixelFormat createFormatBGR555() {
+		return PixelFormat(2,3,3,3,8,0,5,10,0);
+	}
 	static inline PixelFormat createFormatXRGB1555() {
 		//Special case, alpha bit is always high in this mode.
 		return PixelFormat(2,3,3,3,7,10,5,0,15);
 	}
+	static inline PixelFormat createFormatXBGR1555() {
+		//Special case, alpha bit is always high in this mode.
+		return PixelFormat(2,3,3,3,7,0,5,10,15);
+	}
 	static inline PixelFormat createFormatRGB565() {
 		return PixelFormat(2,3,2,3,8,11,5,0,0);
 	}
+	static inline PixelFormat createFormatBGR565() {
+		return PixelFormat(2,3,2,3,8,0,5,11,0);
+	}
 	static inline PixelFormat createFormatRGBA4444() {
 		return PixelFormat(2,4,4,4,4,12,8,4,0);
 	}
+	static inline PixelFormat createFormatARGB4444() {
+		return PixelFormat(2,4,4,4,4,8,4,0,12);
+	}
+	static inline PixelFormat createFormatABGR4444() {
+		return PixelFormat(2,4,4,4,4,0,4,8,12);
+	}
+	static inline PixelFormat createFormatBGRA4444() {
+		return PixelFormat(2,4,4,4,4,4,8,12,0);
+	}
 #ifdef ENABLE_32BIT
 	//3 to 4 byte per pixel modes
 	static inline PixelFormat createFormatRGB888() {
 		return PixelFormat(3,0,0,0,8,16,8,0,0);
 	}
+	static inline PixelFormat createFormatBGR888() {
+		return PixelFormat(3,0,0,0,8,0,8,16,0);
+	}
 	static inline PixelFormat createFormatRGBA8888() {
 		return PixelFormat(4,0,0,0,0,24,16,8,0);
 	}
+	static inline PixelFormat createFormatARGB8888() {
+		return PixelFormat(4,0,0,0,0,16,8,0,24);
+	}
+	static inline PixelFormat createFormatABGR8888() {
+		return PixelFormat(4,0,0,0,0,0,8,16,24);
+	}
+	static inline PixelFormat createFormatBGRA8888() {
+		return PixelFormat(4,0,0,0,0,8,16,24,0);
+	}
 #endif  //ENABLE_32BIT
 #endif  //ENABLE_RGB_COLOR
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.