From 6ead5241397ccb270d85ced076215a585cb260cb Mon Sep 17 00:00:00 2001
From: Nick Gasson <nick@nickg.me.uk>
Date: Wed, 8 Jul 2009 11:31:34 +0100
Subject: [PATCH] Only print OpenGL version info once

---
 include/OpenGLHelper.hpp |  1 +
 src/FLTKWindow.cpp       |  2 ++
 src/Main.cpp             |  2 +-
 src/OpenGLHelper.cpp     | 12 ++++++++----
 src/SDLWindow.cpp        |  3 ++-
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/include/OpenGLHelper.hpp b/include/OpenGLHelper.hpp
index 4187cf2..163b1f6 100644
--- a/include/OpenGLHelper.hpp
+++ b/include/OpenGLHelper.hpp
@@ -27,6 +27,7 @@
 void initGL();
 void drawGLScene(IWindowPtr aWindow, IGraphicsPtr aContext, IScreenPtr aScreen);
 void resizeGLScene(IWindowPtr aWindow);
+void printGLVersion();
 
 // Wrappers for OpenGL picking features
 void beginPick(IWindowPtr aWindow, unsigned* aBuffer, int x, int y);
diff --git a/src/FLTKWindow.cpp b/src/FLTKWindow.cpp
index 45e84c1..53f786f 100644
--- a/src/FLTKWindow.cpp
+++ b/src/FLTKWindow.cpp
@@ -91,6 +91,8 @@ FLTKWindow::FLTKWindow()
    Fl::wait();
 
    make_current();
+
+   printGLVersion();
 }
 
 FLTKWindow::~FLTKWindow()
diff --git a/src/Main.cpp b/src/Main.cpp
index 7aac368..00357f6 100644
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -43,7 +43,7 @@ int main(int argc, char** argv)
 #ifndef WIN32
       if (argc != 3)
          throw runtime_error("Usage: TrainGame (edit|play) [map]");
-
+      
       const string mapFile(argv[2]);
       const string cmd(argv[1]);
 #else
diff --git a/src/OpenGLHelper.cpp b/src/OpenGLHelper.cpp
index 38d163a..d8b9b46 100644
--- a/src/OpenGLHelper.cpp
+++ b/src/OpenGLHelper.cpp
@@ -83,6 +83,13 @@ void drawGLScene(IWindowPtr aWindow, IGraphicsPtr aContext, IScreenPtr aScreen)
    }
 }
 
+// Report the current OpenGL version
+void printGLVersion()
+{
+   log() << "OpenGL version: " << glGetString(GL_VERSION);
+   log() << "GLEW version: " << glewGetString(GLEW_VERSION);
+}
+
 // Set initial OpenGL options
 void initGL()
 {
@@ -94,10 +101,7 @@ void initGL()
    glDepthFunc(GL_LEQUAL);
    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
-   // Check for OpenGL extensions
-   log() << "OpenGL version: " << glGetString(GL_VERSION);
-   log() << "GLEW version: " << glewGetString(GLEW_VERSION);
-
+   // Check for OpenGL extensions   
    GLenum err = glewInit();
    if (err != GLEW_OK)
       throw runtime_error("GLEW initialisation failed: "
diff --git a/src/SDLWindow.cpp b/src/SDLWindow.cpp
index 44a47ee..478d4f5 100644
--- a/src/SDLWindow.cpp
+++ b/src/SDLWindow.cpp
@@ -163,8 +163,9 @@ SDLWindow::SDLWindow()
    //SDL_ShowCursor(SDL_DISABLE);
    
    // Start OpenGL
+   printGLVersion();
    initGL();
-
+   
    log() << "Created " << myWidth << "x" << myHeight << " window";
 }
 
-- 
2.39.2