Removed PixelFormat convenience constructors at behest of Max and Eugene.

svn-id: r42207

3 files changed, 34 insertions, 19 deletions

diff --git a/backends/platform/sdl/graphics.cpp b/backends/platform/sdl/graphics.cpp
index 27f32ee8d2..95a3276fa5 100644
--- a/backends/platform/sdl/graphics.cpp
+++ b/backends/platform/sdl/graphics.cpp
@@ -361,7 +361,7 @@ void OSystem_SDL::initSize(uint w, uint h, const Graphics::PixelFormat *format)
 	//avoid redundant format changes
 	Graphics::PixelFormat newFormat;
 	if (!format)
-		newFormat = Graphics::PixelFormat::createFormatCLUT8();
+		newFormat = Graphics::PixelFormat(1, 8, 8, 8, 8, 0, 0, 0, 0);
 	else
 		newFormat = *format;
 
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index 105206ec07..f7bd71361f 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -197,8 +197,8 @@ OSystem_SDL::OSystem_SDL()
 #endif
 	_hwscreen(0), _screen(0), _tmpscreen(0),
 #ifdef ENABLE_RGB_COLOR
-	_screenFormat(Graphics::PixelFormat::createFormatCLUT8()),
-	_cursorFormat(Graphics::PixelFormat::createFormatCLUT8()),
+	_screenFormat(Graphics::PixelFormat(1, 8, 8, 8, 8, 0, 0, 0, 0)),
+	_cursorFormat(Graphics::PixelFormat(1, 8, 8, 8, 8, 0, 0, 0, 0)),
 #endif
 	_overlayVisible(false),
 	_overlayscreen(0), _tmpscreen2(0),
diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h
index 68dfe64d53..b8ab2f6d97 100644
--- a/backends/platform/sdl/sdl.h
+++ b/backends/platform/sdl/sdl.h
@@ -94,29 +94,44 @@ public:
 		if (HWFormat->BitsPerPixel >= 32)
 		{
 			list.push_back(Graphics::PixelFormat::createFormatRGBA8888());
-			list.push_back(Graphics::PixelFormat::createFormatARGB8888());
-			list.push_back(Graphics::PixelFormat::createFormatABGR8888());
-			list.push_back(Graphics::PixelFormat::createFormatBGRA8888());			}
+			list.push_back(Graphics::PixelFormat(4, 0, 0, 0, 0, 16, 8, 0, 24)
+);
+			list.push_back(Graphics::PixelFormat(4, 0, 0, 0, 0, 0, 8, 16, 24)
+);
+			list.push_back(Graphics::PixelFormat(4, 0, 0, 0, 0, 8, 16, 24, 0)
+);			}
 		if (HWFormat->BitsPerPixel >= 24)
 		{
-			list.push_back(Graphics::PixelFormat::createFormatRGB888());
-			list.push_back(Graphics::PixelFormat::createFormatBGR888());
+			list.push_back(Graphics::PixelFormat(3, 0, 0, 0, 8, 16, 8, 0, 0)
+);
+			list.push_back(Graphics::PixelFormat(3, 0, 0, 0, 8, 0, 8, 16, 0)
+);
 		}
 #endif  //ENABLE_32BIT
 		if (HWFormat->BitsPerPixel >= 16)
 		{
-			list.push_back(Graphics::PixelFormat::createFormatRGB565());
-			list.push_back(Graphics::PixelFormat::createFormatXRGB1555());
-			list.push_back(Graphics::PixelFormat::createFormatRGB555());
-			list.push_back(Graphics::PixelFormat::createFormatRGBA4444());
-			list.push_back(Graphics::PixelFormat::createFormatARGB4444());
-			list.push_back(Graphics::PixelFormat::createFormatBGR565());
-			list.push_back(Graphics::PixelFormat::createFormatXBGR1555());
-			list.push_back(Graphics::PixelFormat::createFormatBGR555());
-			list.push_back(Graphics::PixelFormat::createFormatABGR4444());
-			list.push_back(Graphics::PixelFormat::createFormatBGRA4444());
+			list.push_back(Graphics::PixelFormat(2, 3, 2, 3, 8, 11, 5, 0, 0)
+);
+			list.push_back(Graphics::PixelFormat(2, 3, 3, 3, 7, 10, 5, 0, 15)
+);
+			list.push_back(Graphics::PixelFormat(2, 3, 3, 3, 8, 10, 5, 0, 0)
+);
+			list.push_back(Graphics::PixelFormat(2, 4, 4, 4, 4, 12, 8, 4, 0)
+);
+			list.push_back(Graphics::PixelFormat(2, 4, 4, 4, 4, 8, 4, 0, 12)
+);
+			list.push_back(Graphics::PixelFormat(2, 3, 2, 3, 8, 0, 5, 11, 0)
+);
+			list.push_back(Graphics::PixelFormat(2, 3, 3, 3, 7, 0, 5, 10, 15)
+);
+			list.push_back(Graphics::PixelFormat(2, 3, 3, 3, 8, 0, 5, 10, 0)
+);
+			list.push_back(Graphics::PixelFormat(2, 4, 4, 4, 4, 0, 4, 8, 12)
+);
+			list.push_back(Graphics::PixelFormat(2, 4, 4, 4, 4, 4, 8, 12, 0)
+);
 		}
-		list.push_back(Graphics::PixelFormat::createFormatCLUT8());
+		list.push_back(Graphics::PixelFormat(1, 8, 8, 8, 8, 0, 0, 0, 0));
 		return list;
 	}
 #endif