From 6241f047a89e3064d99e84969671f5b45181e0dd Mon Sep 17 00:00:00 2001
From: "alexey.lysiuk" <alexey.lysiuk@gmail.com>
Date: Sat, 13 Dec 2014 12:32:20 +0200
Subject: [PATCH 1/2] Removed no longer used SDL wrapper functions from OS X
 native backend

---
 src/cocoa/i_backend_cocoa.mm | 70 ------------------------------------
 1 file changed, 70 deletions(-)

diff --git a/src/cocoa/i_backend_cocoa.mm b/src/cocoa/i_backend_cocoa.mm
index df2a1f450..6abf1b7d1 100644
--- a/src/cocoa/i_backend_cocoa.mm
+++ b/src/cocoa/i_backend_cocoa.mm
@@ -1725,72 +1725,6 @@ int SDL_GetDesktopDisplayMode(int displayIndex, SDL_DisplayMode *mode)
 	return 0;
 }
 
-SDL_Rect** SDL_ListModes(SDL_PixelFormat* format, Uint32 flags)
-{
-	ZD_UNUSED(format);
-	ZD_UNUSED(flags);
-	
-	static std::vector<SDL_Rect*> resolutions;
-	
-	if (resolutions.empty())
-	{
-#define DEFINE_RESOLUTION(WIDTH, HEIGHT)                                     \
-	static SDL_Rect resolution_##WIDTH##_##HEIGHT = { 0, 0, WIDTH, HEIGHT }; \
-	resolutions.push_back(&resolution_##WIDTH##_##HEIGHT);
-		
-		DEFINE_RESOLUTION( 640,  480);
-		DEFINE_RESOLUTION( 720,  480);
-		DEFINE_RESOLUTION( 800,  480);
-		DEFINE_RESOLUTION( 800,  600);
-		DEFINE_RESOLUTION(1024,  600);
-		DEFINE_RESOLUTION(1024,  640);
-		DEFINE_RESOLUTION(1024,  768);
-		DEFINE_RESOLUTION(1152,  720);
-		DEFINE_RESOLUTION(1152,  864);
-		DEFINE_RESOLUTION(1280,  720);
-		DEFINE_RESOLUTION(1280,  768);
-		DEFINE_RESOLUTION(1280,  800);
-		DEFINE_RESOLUTION(1280,  854);
-		DEFINE_RESOLUTION(1280,  960);
-		DEFINE_RESOLUTION(1280, 1024);
-		DEFINE_RESOLUTION(1366,  768);
-		DEFINE_RESOLUTION(1400, 1050);
-		DEFINE_RESOLUTION(1440,  900);
-		DEFINE_RESOLUTION(1440,  960);
-		DEFINE_RESOLUTION(1440, 1080);
-		DEFINE_RESOLUTION(1600,  900);
-		DEFINE_RESOLUTION(1600, 1200);
-		DEFINE_RESOLUTION(1680, 1050);
-		DEFINE_RESOLUTION(1920, 1080);
-		DEFINE_RESOLUTION(1920, 1200);
-		DEFINE_RESOLUTION(2048, 1080);
-		DEFINE_RESOLUTION(2048, 1536);
-		DEFINE_RESOLUTION(2560, 1080);
-		DEFINE_RESOLUTION(2560, 1440);
-		DEFINE_RESOLUTION(2560, 1600);
-		DEFINE_RESOLUTION(2560, 2048);
-		DEFINE_RESOLUTION(2880, 1800);
-		DEFINE_RESOLUTION(3200, 1800);
-		DEFINE_RESOLUTION(3440, 1440);
-		DEFINE_RESOLUTION(3840, 2160);
-		DEFINE_RESOLUTION(3840, 2400);
-		DEFINE_RESOLUTION(4096, 2160);
-		DEFINE_RESOLUTION(5120, 2880);
-		
-#undef DEFINE_RESOLUTION
-		
-		resolutions.push_back(NULL);
-	}
-	
-	return &resolutions[0];
-}
-
-int SDL_ShowCursor(int)
-{
-	// Does nothing
-	return 0;
-}
-
 
 static SDL_PixelFormat* GetPixelFormat()
 {
@@ -2205,10 +2139,6 @@ DarwinVersion GetDarwinVersion()
 const DarwinVersion darwinVersion = GetDarwinVersion();
 
 
-#ifdef main
-#undef main
-#endif // main
-
 int main(int argc, char** argv)
 {
 	gettimeofday(&s_startTicks, NULL);

From 9837721d7f882ed2e86206f36e7b10cd5352a79c Mon Sep 17 00:00:00 2001
From: "alexey.lysiuk" <alexey.lysiuk@gmail.com>
Date: Sat, 13 Dec 2014 12:32:29 +0200
Subject: [PATCH 2/2] Added several missing video resolutions

All feasible display dimensions are in the list except with 21:9 aspect ratio
---
 src/sdl/sdlvideo.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/sdl/sdlvideo.cpp b/src/sdl/sdlvideo.cpp
index 5b96389a5..e477df526 100644
--- a/src/sdl/sdlvideo.cpp
+++ b/src/sdl/sdlvideo.cpp
@@ -148,6 +148,7 @@ static MiniModeInfo WinModes[] =
 	{ 720, 480 },	// 16:10
 	{ 720, 540 },
 	{ 800, 450 },	// 16:9
+	{ 800, 480 },
 	{ 800, 500 },	// 16:10
 	{ 800, 600 },
 	{ 848, 480 },	// 16:9
@@ -162,13 +163,18 @@ static MiniModeInfo WinModes[] =
 	{ 1152, 720 },	// 16:10
 	{ 1152, 864 },
 	{ 1280, 720 },	// 16:9
+	{ 1280, 854 },
 	{ 1280, 800 },	// 16:10
 	{ 1280, 960 },
 	{ 1280, 1024 },	// 5:4
 	{ 1360, 768 },	// 16:9
+	{ 1366, 768 },
 	{ 1400, 787 },	// 16:9
 	{ 1400, 875 },	// 16:10
 	{ 1400, 1050 },
+	{ 1440, 900 },
+	{ 1440, 960 },
+	{ 1440, 1080 },
 	{ 1600, 900 },	// 16:9
 	{ 1600, 1000 },	// 16:10
 	{ 1600, 1200 },
@@ -177,8 +183,12 @@ static MiniModeInfo WinModes[] =
 	{ 2048, 1536 },
 	{ 2560, 1440 },
 	{ 2560, 1600 },
+	{ 2560, 2048 },
 	{ 2880, 1800 },
+	{ 3200, 1800 },
 	{ 3840, 2160 },
+	{ 3840, 2400 },
+	{ 4096, 2160 },
 	{ 5120, 2880 }
 };