From d7c5d3052371f602fa5dea7a648c7e793a94ab05 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sun, 30 Mar 2014 14:55:20 +0200
Subject: [PATCH] GL3: Remove GL_ARB_texture_non_power_of_two

--HG--
branch : opengl3
---
 .../src/3d/driver/opengl3/driver_opengl.cpp   |  2 +-
 .../opengl3/driver_opengl_extension.cpp       | 25 +++++--------------
 .../driver/opengl3/driver_opengl_extension.h  |  3 ---
 3 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/code/nel/src/3d/driver/opengl3/driver_opengl.cpp b/code/nel/src/3d/driver/opengl3/driver_opengl.cpp
index d64914fb5..0b9b4ab14 100644
--- a/code/nel/src/3d/driver/opengl3/driver_opengl.cpp
+++ b/code/nel/src/3d/driver/opengl3/driver_opengl.cpp
@@ -533,7 +533,7 @@ bool CDriverGL3::supportBloomEffect() const
 // ***************************************************************************
 bool CDriverGL3::supportNonPowerOfTwoTextures() const
 {
-	return _Extensions.ARBTextureNonPowerOfTwo;
+	return true;
 }
 
 // ***************************************************************************
diff --git a/code/nel/src/3d/driver/opengl3/driver_opengl_extension.cpp b/code/nel/src/3d/driver/opengl3/driver_opengl_extension.cpp
index 0741fae9c..589f559e7 100644
--- a/code/nel/src/3d/driver/opengl3/driver_opengl_extension.cpp
+++ b/code/nel/src/3d/driver/opengl3/driver_opengl_extension.cpp
@@ -513,16 +513,6 @@ static bool setupARBMultiTexture(const char	*glext)
 	return true;
 }
 
-// *********************************
-static bool	setupARBTextureNonPowerOfTwo(const char	*glext)
-{
-	H_AUTO_OGL(setupARBTextureCompression);
-
-	CHECK_EXT("GL_ARB_texture_non_power_of_two");
-
-	return true;
-}
-
 // *********************************
 static bool	setupEXTTextureCompressionS3TC(const char	*glext)
 {
@@ -896,6 +886,12 @@ void	registerGlExtensions(CGlExtensions &ext)
 	// Check GL_ARB_separate_shader_objects
 	ext.ARBSeparateShaderObjects = setupARBSeparateShaderObjects(glext);
 
+	// Compression S3TC
+	ext.EXTTextureCompressionS3TC = setupEXTTextureCompressionS3TC(glext);
+
+	// Check GL_EXT_texture_filter_anisotropic
+	ext.EXTTextureFilterAnisotropic = setupEXTTextureFilterAnisotropic(glext);
+
 	// Check ARBMultiTexture
 	ext.ARBMultiTexture= setupARBMultiTexture(glext);
 	if (ext.ARBMultiTexture)
@@ -906,15 +902,9 @@ void	registerGlExtensions(CGlExtensions &ext)
 		ext.NbTextureStages= (ntext<((GLint)IDRV_MAT_MAXTEXTURES)?ntext:IDRV_MAT_MAXTEXTURES);
 	}
 
-	// Check ARBTextureNonPowerOfTwo
-	ext.ARBTextureNonPowerOfTwo= setupARBTextureNonPowerOfTwo(glext);
-
 	// Check ARBMultisample
 	ext.ARBMultisample = setupARBMultisample(glext);
 
-	// Compression S3TC OK iff ARBTextureCompression.
-	ext.EXTTextureCompressionS3TC= setupEXTTextureCompressionS3TC(glext);
-
 	// Check if NVidia GL_EXT_vertex_weighting is available.
 	ext.EXTVertexWeighting= setupEXTVertexWeighting(glext);
 
@@ -939,9 +929,6 @@ void	registerGlExtensions(CGlExtensions &ext)
 	// Check GL_ARB_texture_rectangle
 	ext.ARBTextureRectangle = setupARBTextureRectangle(glext);
 
-	// Check GL_EXT_texture_filter_anisotropic
-	ext.EXTTextureFilterAnisotropic = setupEXTTextureFilterAnisotropic(glext);
-
 	if (ext.EXTTextureFilterAnisotropic)
 	{
 		// get the maximum value
diff --git a/code/nel/src/3d/driver/opengl3/driver_opengl_extension.h b/code/nel/src/3d/driver/opengl3/driver_opengl_extension.h
index 86ff3da26..8bbc8b49c 100644
--- a/code/nel/src/3d/driver/opengl3/driver_opengl_extension.h
+++ b/code/nel/src/3d/driver/opengl3/driver_opengl_extension.h
@@ -57,7 +57,6 @@ struct	CGlExtensions
 	bool	ARBTextureRectangle;
 	bool	EXTSecondaryColor;
 	bool	EXTBlendColor;
-	bool	ARBTextureNonPowerOfTwo;
 	bool	ARBMultisample;
 
 	// WGL ARB extensions, true if supported
@@ -93,7 +92,6 @@ public:
 		EXTTextureFilterAnisotropic = false;
 		EXTTextureFilterAnisotropicMaximum = 0.f;
 		ARBTextureRectangle = false;
-		ARBTextureNonPowerOfTwo = false;
 		ARBMultisample = false;
 	}
 
@@ -111,7 +109,6 @@ public:
 		result += EXTTextureRectangle ? "EXTTextureRectangle " : "";
 		result += ARBTextureRectangle ? "ARBTextureRectangle " : "";
 		result += EXTTextureFilterAnisotropic ? "EXTTextureFilterAnisotropic (Maximum = " + NLMISC::toString(EXTTextureFilterAnisotropicMaximum) + ") " : "";
-		result += ARBTextureNonPowerOfTwo ? "ARBTextureNonPowerOfTwo " : "";
 		result += "texture stages(*) = ";
 		result += NLMISC::toString(NbTextureStages);