GL3: Remove GL_ARB_texture_non_power_of_two

--HG--
branch : opengl3
hg/feature/opengl3
kaetemi 11 years ago
parent 79141e0a9c
commit d7c5d30523

@ -533,7 +533,7 @@ bool CDriverGL3::supportBloomEffect() const
// *************************************************************************** // ***************************************************************************
bool CDriverGL3::supportNonPowerOfTwoTextures() const bool CDriverGL3::supportNonPowerOfTwoTextures() const
{ {
return _Extensions.ARBTextureNonPowerOfTwo; return true;
} }
// *************************************************************************** // ***************************************************************************

@ -513,16 +513,6 @@ static bool setupARBMultiTexture(const char *glext)
return true; 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) static bool setupEXTTextureCompressionS3TC(const char *glext)
{ {
@ -896,6 +886,12 @@ void registerGlExtensions(CGlExtensions &ext)
// Check GL_ARB_separate_shader_objects // Check GL_ARB_separate_shader_objects
ext.ARBSeparateShaderObjects = setupARBSeparateShaderObjects(glext); ext.ARBSeparateShaderObjects = setupARBSeparateShaderObjects(glext);
// Compression S3TC
ext.EXTTextureCompressionS3TC = setupEXTTextureCompressionS3TC(glext);
// Check GL_EXT_texture_filter_anisotropic
ext.EXTTextureFilterAnisotropic = setupEXTTextureFilterAnisotropic(glext);
// Check ARBMultiTexture // Check ARBMultiTexture
ext.ARBMultiTexture= setupARBMultiTexture(glext); ext.ARBMultiTexture= setupARBMultiTexture(glext);
if (ext.ARBMultiTexture) if (ext.ARBMultiTexture)
@ -906,15 +902,9 @@ void registerGlExtensions(CGlExtensions &ext)
ext.NbTextureStages= (ntext<((GLint)IDRV_MAT_MAXTEXTURES)?ntext:IDRV_MAT_MAXTEXTURES); ext.NbTextureStages= (ntext<((GLint)IDRV_MAT_MAXTEXTURES)?ntext:IDRV_MAT_MAXTEXTURES);
} }
// Check ARBTextureNonPowerOfTwo
ext.ARBTextureNonPowerOfTwo= setupARBTextureNonPowerOfTwo(glext);
// Check ARBMultisample // Check ARBMultisample
ext.ARBMultisample = setupARBMultisample(glext); ext.ARBMultisample = setupARBMultisample(glext);
// Compression S3TC OK iff ARBTextureCompression.
ext.EXTTextureCompressionS3TC= setupEXTTextureCompressionS3TC(glext);
// Check if NVidia GL_EXT_vertex_weighting is available. // Check if NVidia GL_EXT_vertex_weighting is available.
ext.EXTVertexWeighting= setupEXTVertexWeighting(glext); ext.EXTVertexWeighting= setupEXTVertexWeighting(glext);
@ -939,9 +929,6 @@ void registerGlExtensions(CGlExtensions &ext)
// Check GL_ARB_texture_rectangle // Check GL_ARB_texture_rectangle
ext.ARBTextureRectangle = setupARBTextureRectangle(glext); ext.ARBTextureRectangle = setupARBTextureRectangle(glext);
// Check GL_EXT_texture_filter_anisotropic
ext.EXTTextureFilterAnisotropic = setupEXTTextureFilterAnisotropic(glext);
if (ext.EXTTextureFilterAnisotropic) if (ext.EXTTextureFilterAnisotropic)
{ {
// get the maximum value // get the maximum value

@ -57,7 +57,6 @@ struct CGlExtensions
bool ARBTextureRectangle; bool ARBTextureRectangle;
bool EXTSecondaryColor; bool EXTSecondaryColor;
bool EXTBlendColor; bool EXTBlendColor;
bool ARBTextureNonPowerOfTwo;
bool ARBMultisample; bool ARBMultisample;
// WGL ARB extensions, true if supported // WGL ARB extensions, true if supported
@ -93,7 +92,6 @@ public:
EXTTextureFilterAnisotropic = false; EXTTextureFilterAnisotropic = false;
EXTTextureFilterAnisotropicMaximum = 0.f; EXTTextureFilterAnisotropicMaximum = 0.f;
ARBTextureRectangle = false; ARBTextureRectangle = false;
ARBTextureNonPowerOfTwo = false;
ARBMultisample = false; ARBMultisample = false;
} }
@ -111,7 +109,6 @@ public:
result += EXTTextureRectangle ? "EXTTextureRectangle " : ""; result += EXTTextureRectangle ? "EXTTextureRectangle " : "";
result += ARBTextureRectangle ? "ARBTextureRectangle " : ""; result += ARBTextureRectangle ? "ARBTextureRectangle " : "";
result += EXTTextureFilterAnisotropic ? "EXTTextureFilterAnisotropic (Maximum = " + NLMISC::toString(EXTTextureFilterAnisotropicMaximum) + ") " : ""; result += EXTTextureFilterAnisotropic ? "EXTTextureFilterAnisotropic (Maximum = " + NLMISC::toString(EXTTextureFilterAnisotropicMaximum) + ") " : "";
result += ARBTextureNonPowerOfTwo ? "ARBTextureNonPowerOfTwo " : "";
result += "texture stages(*) = "; result += "texture stages(*) = ";
result += NLMISC::toString(NbTextureStages); result += NLMISC::toString(NbTextureStages);

Loading…
Cancel
Save