fly/flightgear
1
0
Fork 0
Code Activity

Make FlightGear work with 16bpp:

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

2. Do not try to enable stencil in 16bpp.
This commit is contained in:
david 2004-11-03 04:18:27 +00:00
parent b82cc40c58
commit 889dba8d65
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/Main/fg_os_sdl.cxx
View file

@ -1,5 +1,9 @@
#include <stdlib.h> #include <stdlib.h>
#include <simgear/compiler.h>
#include <simgear/structure/exception.hxx>
#include <simgear/debug/logstream.hxx>
#include <SDL/SDL.h> #include <SDL/SDL.h>
#include <plib/pu.h> #include <plib/pu.h>
@ -63,14 +67,16 @@ void fgOSOpenWindow(int w, int h, int bpp,
int cbits = (bpp <= 16) ? 5 : 8; int cbits = (bpp <= 16) ? 5 : 8;
int zbits = (bpp <= 16) ? 16 : 24; 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_RED_SIZE, cbits);
SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, cbits); SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, cbits);
SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, cbits); SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, cbits);
if(alpha) if(alpha)
SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 8); 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_STENCIL_SIZE, 8);
SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, zbits); SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, zbits);
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
@ -79,7 +85,9 @@ void fgOSOpenWindow(int w, int h, int bpp,
if(fullscreen) { if(fullscreen) {
vidmask |= SDL_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"); SDL_WM_SetCaption("FlightGear", "FlightGear");