Formatting fix

This commit is contained in:
Bart van Strien
2012-01-06 17:08:52 +01:00
parent f58f80397e
commit c78c6801e9
+8 -8
View File
@@ -97,27 +97,27 @@ namespace sdl
// FSAA // FSAA
if (fsaa > 0) if (fsaa > 0)
{ {
SDL_GL_SetAttribute( SDL_GL_MULTISAMPLEBUFFERS, 1 ) ; SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 1);
SDL_GL_SetAttribute( SDL_GL_MULTISAMPLESAMPLES, fsaa ) ; SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, fsaa);
} }
// Fullscreen? // Fullscreen?
Uint32 sdlflags = fullscreen ? (SDL_OPENGL | SDL_FULLSCREEN) : SDL_OPENGL; Uint32 sdlflags = fullscreen ? (SDL_OPENGL | SDL_FULLSCREEN) : SDL_OPENGL;
// Have SDL set the video mode. // Have SDL set the video mode.
if (SDL_SetVideoMode(width, height, 32, sdlflags ) == 0) if (SDL_SetVideoMode(width, height, 32, sdlflags) == 0)
{ {
bool failed = true; bool failed = true;
if (fsaa > 0) if (fsaa > 0)
{ {
// FSAA might have failed, disable it and try again // FSAA might have failed, disable it and try again
SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 0); SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 0);
failed = SDL_SetVideoMode(width, height, 32, sdlflags ) == 0; failed = SDL_SetVideoMode(width, height, 32, sdlflags) == 0;
if (failed) if (failed)
{ {
// There might be no FSAA at all // There might be no FSAA at all
SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 0); SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 0);
failed = SDL_SetVideoMode(width, height, 32, sdlflags ) == 0; failed = SDL_SetVideoMode(width, height, 32, sdlflags) == 0;
} }
} }
if (failed) if (failed)
@@ -142,11 +142,11 @@ namespace sdl
GLint buffers; GLint buffers;
GLint samples; GLint samples;
glGetIntegerv( GL_SAMPLE_BUFFERS_ARB, & buffers ) ; glGetIntegerv(GL_SAMPLE_BUFFERS_ARB, &buffers);
glGetIntegerv( GL_SAMPLES_ARB, & samples ) ; glGetIntegerv(GL_SAMPLES_ARB, &samples);
// Don't fail because of this, but issue a warning. // Don't fail because of this, but issue a warning.
if ( (! buffers && fsaa) || (samples != fsaa)) if ((!buffers && fsaa) || (samples != fsaa))
{ {
std::cerr << "Warning, quality setting failed! (Result: buffers: " << buffers << ", samples: " << samples << ")" << std::endl; std::cerr << "Warning, quality setting failed! (Result: buffers: " << buffers << ", samples: " << samples << ")" << std::endl;
fsaa = !buffers ? 0 : samples; fsaa = !buffers ? 0 : samples;