From 295fa1e73f21418af4b6dd383243b07b840eba28 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Fri, 10 Apr 2020 22:02:14 +0200
Subject: [PATCH] - header cleanup in gl_interface.cpp

---
 src/rendering/gl_load/gl_interface.cpp | 58 ++++++++++++++------------
 src/rendering/gl_load/gl_interface.h   |  2 -
 2 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/src/rendering/gl_load/gl_interface.cpp b/src/rendering/gl_load/gl_interface.cpp
index 1beb8cac9..10e727d8e 100644
--- a/src/rendering/gl_load/gl_interface.cpp
+++ b/src/rendering/gl_load/gl_interface.cpp
@@ -1,40 +1,46 @@
-// 
-//---------------------------------------------------------------------------
-//
-// Copyright(C) 2005-2016 Christoph Oelckers
-// All rights reserved.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this program.  If not, see http://www.gnu.org/licenses/
-//
-//--------------------------------------------------------------------------
-//
 /*
-** r_opengl.cpp
-**
+** gl_interface.cpp
 ** OpenGL system interface
 **
+**---------------------------------------------------------------------------
+** Copyright 2005-2019 Christoph Oelckers
+** All rights reserved.
+**
+** Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions
+** are met:
+**
+** 1. Redistributions of source code must retain the above copyright
+**    notice, this list of conditions and the following disclaimer.
+** 2. Redistributions in binary form must reproduce the above copyright
+**    notice, this list of conditions and the following disclaimer in the
+**    documentation and/or other materials provided with the distribution.
+** 3. The name of the author may not be used to endorse or promote products
+**    derived from this software without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+** OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+** IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+** INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+** NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+**---------------------------------------------------------------------------
+**
 */
 
 #include "gl_load/gl_system.h"
 #include "engineerrors.h"
 #include "tarray.h"
-#include "doomtype.h"
+#include "basics.h"
 #include "m_argv.h"
 #include "version.h"
 #include "v_video.h"
+#include "printf.h"
 #include "gl_load/gl_interface.h"
-#include "hwrenderer/utility/hw_cvars.h"
 
 static TArray<FString>  m_Extensions;
 RenderContext gl;
@@ -131,7 +137,7 @@ void gl_LoadExtensions()
 	// Don't even start if it's lower than 2.0 or no framebuffers are available (The framebuffer extension is needed for glGenerateMipmapsEXT!)
 	if (gl_version < 3.3f)
 	{
-		I_FatalError("Unsupported OpenGL version.\nAt least OpenGL 3.3 is required to run " GAMENAME ".\nFor older versions of OpenGL please download the vintage build of " GAMENAME ".\n");
+		I_FatalError("Unsupported OpenGL version.\nAt least OpenGL 3.3 is required to run " GAMENAME ".\n");
 	}
 
 
diff --git a/src/rendering/gl_load/gl_interface.h b/src/rendering/gl_load/gl_interface.h
index bcec2817f..a2e97db8d 100644
--- a/src/rendering/gl_load/gl_interface.h
+++ b/src/rendering/gl_load/gl_interface.h
@@ -1,8 +1,6 @@
 #ifndef R_RENDER
 #define R_RENDER
 
-#include "basics.h"
-
 struct RenderContext
 {
 	unsigned int flags;