From a663c571017749cc2328bb7830d88bc75a45e35c Mon Sep 17 00:00:00 2001 From: Taylor Richards Date: Sun, 8 Mar 2015 17:33:06 -0400 Subject: [PATCH] quiet some OCD --- src/graphics/grgl1.cpp | 2 +- src/graphics/gropengl.cpp | 23 +++++++++++------------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/graphics/grgl1.cpp b/src/graphics/grgl1.cpp index 82e2c41..848cdc8 100644 --- a/src/graphics/grgl1.cpp +++ b/src/graphics/grgl1.cpp @@ -205,7 +205,7 @@ void opengl1_init() OGL_fog_mode = 1; } - mprintf((" Fog mode: %s\n", (OGL_fog_mode == 1) ? "secondary color" : "linear")); + mprintf((" Fog mode : %s\n", (OGL_fog_mode == 1) ? "secondary color" : "linear")); glShadeModel(GL_SMOOTH); glEnable(GL_DITHER); diff --git a/src/graphics/gropengl.cpp b/src/graphics/gropengl.cpp index 5f9586d..2351e16 100644 --- a/src/graphics/gropengl.cpp +++ b/src/graphics/gropengl.cpp @@ -186,7 +186,16 @@ void gr_opengl_init() mprintf((" Renderer : %s\n", glGetString(GL_RENDERER))); mprintf((" Version : %s\n", gl_version)); - mprintf((" Attributes requested: ARGB %d%d%d%d, BPP %d, DB %d, AA %d\n", a, r, g, b, bpp, db, FSAA)); + // initial viewport setup + opengl_init_viewport(); + + // set up generic variables before further init() calls + opengl_set_variables(); + + // main GL init + opengl1_init(); + + mprintf((" Attributes requested : ARGB %d%d%d%d, BPP %d, DB %d, AA %d\n", a, r, g, b, bpp, db, FSAA)); SDL_GL_GetAttribute(SDL_GL_RED_SIZE, &r); SDL_GL_GetAttribute(SDL_GL_GREEN_SIZE, &g); @@ -196,21 +205,11 @@ void gr_opengl_init() SDL_GL_GetAttribute(SDL_GL_DOUBLEBUFFER, &db); SDL_GL_GetAttribute(SDL_GL_MULTISAMPLESAMPLES, &FSAA); - mprintf((" Attributes received : ARGB %d%d%d%d, BPP %d, DB %d, AA %d\n", a, r, g, b, bpp, db, FSAA)); - + mprintf((" Attributes received : ARGB %d%d%d%d, BPP %d, DB %d, AA %d\n", a, r, g, b, bpp, db, FSAA)); SDL_DisableScreenSaver(); SDL_ShowCursor(0); - // initial viewport setup - opengl_init_viewport(); - - // set up generic variables before further init() calls - opengl_set_variables(); - - // main GL init - opengl1_init(); - // maybe go fullscreen - should be done *after* main GL init int fullscreen = os_config_read_uint("Video", "Fullscreen", 1); if ( !Cmdline_window && (fullscreen || Cmdline_fullscreen) ) { -- 2.39.2