okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GLimp_HaveExtension() -> SDL_GL_ExtensionSupported()

Browse source
This commit is contained in:
SmileTheory 2016-12-10 00:35:17 -08:00
parent 0672905ef1
commit 06b47ad2a9
2 changed files with 19 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

23
code/sdl/sdl_glimp.c
View file

@ -566,15 +566,6 @@ static qboolean GLimp_StartDriverAndSetMode(int mode, qboolean fullscreen, qbool
return qtrue;
}
static qboolean GLimp_HaveExtension(const char *ext)
{
const char *ptr = Q_stristr( glConfig.extensions_string, ext );
if (ptr == NULL)
return qfalse;
ptr += strlen(ext);
return ((*ptr == ' ') || (*ptr == '\0')); // verify it's complete string.
}
/*
===============
@ -594,8 +585,8 @@ static void GLimp_InitExtensions( void )
glConfig.textureCompression = TC_NONE;
// GL_EXT_texture_compression_s3tc
if ( GLimp_HaveExtension( "GL_ARB_texture_compression" ) &&
GLimp_HaveExtension( "GL_EXT_texture_compression_s3tc" ) )
if ( SDL_GL_ExtensionSupported( "GL_ARB_texture_compression" ) &&
SDL_GL_ExtensionSupported( "GL_EXT_texture_compression_s3tc" ) )
{
if ( r_ext_compressed_textures->value )
{
@ -615,7 +606,7 @@ static void GLimp_InitExtensions( void )
// GL_S3_s3tc ... legacy extension before GL_EXT_texture_compression_s3tc.
if (glConfig.textureCompression == TC_NONE)
{
if ( GLimp_HaveExtension( "GL_S3_s3tc" ) )
if ( SDL_GL_ExtensionSupported( "GL_S3_s3tc" ) )
{
if ( r_ext_compressed_textures->value )
{
@ -636,7 +627,7 @@ static void GLimp_InitExtensions( void )
// GL_EXT_texture_env_add
glConfig.textureEnvAddAvailable = qfalse;
if ( GLimp_HaveExtension( "EXT_texture_env_add" ) )
if ( SDL_GL_ExtensionSupported( "EXT_texture_env_add" ) )
{
if ( r_ext_texture_env_add->integer )
{
@ -658,7 +649,7 @@ static void GLimp_InitExtensions( void )
qglMultiTexCoord2fARB = NULL;
qglActiveTextureARB = NULL;
qglClientActiveTextureARB = NULL;
if ( GLimp_HaveExtension( "GL_ARB_multitexture" ) )
if ( SDL_GL_ExtensionSupported( "GL_ARB_multitexture" ) )
{
if ( r_ext_multitexture->value )
{
@ -695,7 +686,7 @@ static void GLimp_InitExtensions( void )
}
// GL_EXT_compiled_vertex_array
if ( GLimp_HaveExtension( "GL_EXT_compiled_vertex_array" ) )
if ( SDL_GL_ExtensionSupported( "GL_EXT_compiled_vertex_array" ) )
{
if ( r_ext_compiled_vertex_array->value )
{
@ -718,7 +709,7 @@ static void GLimp_InitExtensions( void )
}
textureFilterAnisotropic = qfalse;
if ( GLimp_HaveExtension( "GL_EXT_texture_filter_anisotropic" ) )
if ( SDL_GL_ExtensionSupported( "GL_EXT_texture_filter_anisotropic" ) )
{
if ( r_ext_texture_filter_anisotropic->integer ) {
qglGetIntegerv( GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, (GLint *)&maxAnisotropy );