From 889dba8d65579ddf418d5a141e0cf9dd332eb441 Mon Sep 17 00:00:00 2001
From: david <david>
Date: Wed, 3 Nov 2004 04:18:27 +0000
Subject: [PATCH] Make FlightGear work with 16bpp:

1. Check that SDL actually initializes successfully and sets up its
   video mode.

2. Do not try to enable stencil in 16bpp.
---
 src/Main/fg_os_sdl.cxx | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/Main/fg_os_sdl.cxx b/src/Main/fg_os_sdl.cxx
index 149a8c86e..b38e20151 100644
--- a/src/Main/fg_os_sdl.cxx
+++ b/src/Main/fg_os_sdl.cxx
@@ -1,5 +1,9 @@
 #include <stdlib.h>
 
+#include <simgear/compiler.h>
+#include <simgear/structure/exception.hxx>
+#include <simgear/debug/logstream.hxx>
+
 #include <SDL/SDL.h>
 #include <plib/pu.h>
 
@@ -63,14 +67,16 @@ void fgOSOpenWindow(int w, int h, int bpp,
     int cbits = (bpp <= 16) ?  5 :  8;
     int zbits = (bpp <= 16) ? 16 : 24;
 
-    SDL_Init(SDL_INIT_VIDEO|SDL_INIT_NOPARACHUTE); // FIXME: handle errors
+    if (SDL_Init(SDL_INIT_VIDEO|SDL_INIT_NOPARACHUTE) == -1)
+        throw sg_throwable(string("Failed to initialize SDL: ")
+                           + SDL_GetError());
 
     SDL_GL_SetAttribute(SDL_GL_RED_SIZE, cbits);
     SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, cbits);
     SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, cbits);
     if(alpha)
         SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 8);
-    if(stencil)
+    if(bpp > 16 && stencil)
         SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 8);
     SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, zbits);
     SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
@@ -79,7 +85,9 @@ void fgOSOpenWindow(int w, int h, int bpp,
     if(fullscreen) {
         vidmask |= SDL_FULLSCREEN;
     }
-    SDL_SetVideoMode(w, h, 16, vidmask); // FIXME: handle errors
+    if (SDL_SetVideoMode(w, h, 16, vidmask) == 0)
+        throw sg_throwable(string("Failed to set SDL video mode: ")
+                                   + SDL_GetError());
 
     SDL_WM_SetCaption("FlightGear", "FlightGear");