GL3: Remove GL_EXT_texture_env_combine

--HG--
branch : opengl3
hg/feature/opengl3
kaetemi 11 years ago
parent b978ec5c8e
commit 2139f39c43

@ -515,15 +515,6 @@ static bool setupARBMultiTexture(const char *glext)
return true;
}
// *********************************
static bool setupEXTTextureEnvCombine(const char *glext)
{
H_AUTO_OGL(setupEXTTextureEnvCombine);
return (strstr(glext, "GL_EXT_texture_env_combine")!=NULL || strstr(glext, "GL_ARB_texture_env_combine")!=NULL);
}
// *********************************
static bool setupARBTextureCompression(const char *glext)
{
@ -1013,9 +1004,6 @@ void registerGlExtensions(CGlExtensions &ext)
ext.NbTextureStages= (ntext<((GLint)IDRV_MAT_MAXTEXTURES)?ntext:IDRV_MAT_MAXTEXTURES);
}
// Check EXTTextureEnvCombine
ext.EXTTextureEnvCombine= setupEXTTextureEnvCombine(glext);
// Check ARBTextureCompression
ext.ARBTextureCompression= setupARBTextureCompression(glext);

@ -42,7 +42,6 @@ struct CGlExtensions
bool ARBMultiTexture;
uint NbTextureStages;
bool EXTTextureEnvCombine;
// Optional Extensions.
bool EXTTextureCompressionS3TC;
@ -90,7 +89,6 @@ public:
// Fill all false by default.
ARBMultiTexture= false;
NbTextureStages= 1;
EXTTextureEnvCombine= false;
ARBTextureCompression= false;
EXTTextureCompressionS3TC= false;
EXTVertexWeighting= false;
@ -129,7 +127,6 @@ public:
result += "\n Texturing: ";
result += ARBMultiTexture ? "ARBMultiTexture " : "";
result += EXTTextureEnvCombine ? "EXTTextureEnvCombine(*) " : "";
result += ARBTextureCompression ? "ARBTextureCompression " : "";
result += EXTTextureCompressionS3TC ? "EXTTextureCompressionS3TC " : "";
result += ATITextureEnvCombine3 ? "ATITextureEnvCombine3 " : "";

Loading…
Cancel
Save