From 0d8dceea4310fde5706b3ce1c70609d72a38efdf Mon Sep 17 00:00:00 2001
From: John Schoenick <johns@valvesoftware.com>
Date: Wed, 9 Sep 2015 18:35:41 -0700
Subject: Updated the SDK with the latest code from the TF and HL2 branches.

---
 mp/src/public/togl/linuxwin/glmgrbasics.h | 40 ++++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 8 deletions(-)

(limited to 'mp/src/public/togl/linuxwin/glmgrbasics.h')

diff --git a/mp/src/public/togl/linuxwin/glmgrbasics.h b/mp/src/public/togl/linuxwin/glmgrbasics.h
index ed380de4..a32938ad 100644
--- a/mp/src/public/togl/linuxwin/glmgrbasics.h
+++ b/mp/src/public/togl/linuxwin/glmgrbasics.h
@@ -1,4 +1,26 @@
 //========= Copyright Valve Corporation, All rights reserved. ============//
+//                       TOGL CODE LICENSE
+//
+//  Copyright 2011-2014 Valve Corporation
+//  All Rights Reserved.
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in
+//  all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//  THE SOFTWARE.
 //
 // glmgrbasics.h
 //	types, common headers, forward declarations, utilities
@@ -10,20 +32,20 @@
 
 #pragma once
 
+#ifdef USE_SDL
+#include "SDL_opengl.h"
+#endif
+
 #ifdef OSX
-	#include <OpenGL/OpenGL.h>
-	#include <OpenGL/gl.h>
-	#include <OpenGL/glext.h>
 	#include <OpenGL/CGLTypes.h>
 	#include <OpenGL/CGLRenderers.h>
 	#include <OpenGL/CGLCurrent.h>
+	#include <AvailabilityMacros.h>
+
+#ifndef MAC_OS_X_VERSION_10_9
 	#include <OpenGL/CGLProfiler.h>
 	#include <ApplicationServices/ApplicationServices.h>
-#elif defined(DX_TO_GL_ABSTRACTION)
-	#include <GL/gl.h>
-	#include <GL/glext.h>
-#else
-	#error
+#endif
 #endif
 
 #include "tier0/platform.h"
@@ -301,8 +323,10 @@ public:
 	CUtlVector< GLMTextSection >	m_sectionTable;
 };
 
+#ifndef OSX
 void GLMGPUTimestampManagerInit();
 void GLMGPUTimestampManagerDeinit();
 void GLMGPUTimestampManagerTick();
+#endif
 
 #endif // GLMBASICS_H
-- 
cgit v1.2.3