From cd712e822faf567c0750c1524039b5bbf964c551 Mon Sep 17 00:00:00 2001
From: kervala <devnull@localhost>
Date: Mon, 22 Nov 2010 11:54:44 +0100
Subject: [PATCH] Fixed: #1201 glXSwapIntervalMESA & glXGetSwapIntervalMESA Not
 present in NVidia GL include file

---
 code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp | 8 ++++----
 code/nel/src/3d/driver/opengl/driver_opengl_extension.h   | 4 ++--
 .../src/3d/driver/opengl/driver_opengl_extension_def.h    | 5 +++++
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp
index b65cf5f28..7485e7d48 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp
@@ -449,8 +449,8 @@ NEL_PFNGLXSWAPINTERVALEXTPROC					nglXSwapIntervalEXT;
 
 PFNGLXSWAPINTERVALSGIPROC						nglXSwapIntervalSGI;
 
-PFNGLXSWAPINTERVALMESAPROC						nglXSwapIntervalMESA;
-PFNGLXGETSWAPINTERVALMESAPROC					nglXGetSwapIntervalMESA;
+NEL_PFNGLXSWAPINTERVALMESAPROC					nglXSwapIntervalMESA;
+NEL_PFNGLXGETSWAPINTERVALMESAPROC				nglXGetSwapIntervalMESA;
 
 #endif
 
@@ -1455,8 +1455,8 @@ static bool	setupGLXMESASwapControl(const char	*glext)
 	CHECK_EXT("GLX_MESA_swap_control");
 
 #if defined(NL_OS_UNIX) && !defined(NL_OS_MAC)
-	CHECK_ADDRESS(PFNGLXSWAPINTERVALMESAPROC, glXSwapIntervalMESA);
-	CHECK_ADDRESS(PFNGLXGETSWAPINTERVALMESAPROC, glXGetSwapIntervalMESA);
+	CHECK_ADDRESS(NEL_PFNGLXSWAPINTERVALMESAPROC, glXSwapIntervalMESA);
+	CHECK_ADDRESS(NEL_PFNGLXGETSWAPINTERVALMESAPROC, glXGetSwapIntervalMESA);
 #endif
 
 	return true;
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_extension.h b/code/nel/src/3d/driver/opengl/driver_opengl_extension.h
index a899049b6..eea1eab36 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl_extension.h
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_extension.h
@@ -702,8 +702,8 @@ extern NEL_PFNGLXSWAPINTERVALEXTPROC			nglXSwapIntervalEXT;
 
 extern PFNGLXSWAPINTERVALSGIPROC				nglXSwapIntervalSGI;
 
-extern PFNGLXSWAPINTERVALMESAPROC				nglXSwapIntervalMESA;
-extern PFNGLXGETSWAPINTERVALMESAPROC			nglXGetSwapIntervalMESA;
+extern NEL_PFNGLXSWAPINTERVALMESAPROC			nglXSwapIntervalMESA;
+extern NEL_PFNGLXGETSWAPINTERVALMESAPROC		nglXGetSwapIntervalMESA;
 
 #endif
 
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_extension_def.h b/code/nel/src/3d/driver/opengl/driver_opengl_extension_def.h
index 3347f7177..6941a1f83 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl_extension_def.h
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_extension_def.h
@@ -395,6 +395,11 @@ typedef GLint (APIENTRY * NEL_PFNGLXSWAPINTERVALEXTPROC) (Display *dpy, GLXDrawa
 
 #endif // NL_GLX_EXT_swap_control
 
+#ifndef NL_GLX_MESA_swap_control
+typedef GLint (APIENTRY * NEL_PFNGLXSWAPINTERVALMESAPROC) (GLuint interval);
+typedef GLint (APIENTRY * NEL_PFNGLXGETSWAPINTERVALMESAPROC) (GLvoid);
+#endif // NL_GLX_MESA_swap_control
+
 #endif // NL_OS_MAC
 
 #ifdef __cplusplus