ubergames/lilium-voyager
0
0
Fork 0
mirror of https://github.com/UberGames/lilium-voyager.git synced 2024-12-13 21:51:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added GL_EXT_texture_compression_s3tc support.

Browse source 
GL_S3_s3tc, which Quake 3 previously supported, is legacy. This new codepath
 is the common, vendor-neutral extension to get the same results.
This commit is contained in:
Ryan C. Gordon 2008-06-13 02:28:51 +00:00
parent a98fed9ee2
commit c923872ca2
3 changed files with 54 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
code/renderer/tr_image.c
View file

@ -182,6 +182,7 @@ void R_ImageList_f( void ) {
ri.Printf( PRINT_ALL, "RGB8" ); ri.Printf( PRINT_ALL, "RGB8" );
break; break;
case GL_RGB4_S3TC: case GL_RGB4_S3TC:
case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
ri.Printf( PRINT_ALL, "S3TC " ); ri.Printf( PRINT_ALL, "S3TC " );
break; break;
case GL_RGBA4: case GL_RGBA4:
@ -602,7 +603,11 @@ static void Upload32( unsigned *data,
} }
else else
{ {
if ( glConfig.textureCompression == TC_S3TC ) if ( glConfig.textureCompression == TC_S3TC_ARB )
{
internalFormat = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT;
}
else if ( glConfig.textureCompression == TC_S3TC )
{ {
internalFormat = GL_RGB4_S3TC; internalFormat = GL_RGB4_S3TC;
} }

3
code/renderer/tr_types.h
View file

@ -151,7 +151,8 @@ typedef enum {
*/ */
typedef enum { typedef enum {
TC_NONE, TC_NONE,
TC_S3TC TC_S3TC, // this is for the GL_S3_s3tc extension.
TC_S3TC_ARB // this is for the GL_EXT_texture_compression_s3tc extension.
} textureCompression_t; } textureCompression_t;
typedef enum { typedef enum {

58
code/sdl/sdl_glimp.c
View file

@ -445,6 +445,17 @@ static qboolean GLimp_StartDriverAndSetMode( int mode, qboolean fullscreen )
return qtrue; 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.
}
/* /*
=============== ===============
GLimp_InitExtensions GLimp_InitExtensions
@ -460,29 +471,52 @@ static void GLimp_InitExtensions( void )
ri.Printf( PRINT_ALL, "Initializing OpenGL extensions\n" ); ri.Printf( PRINT_ALL, "Initializing OpenGL extensions\n" );
// GL_S3_s3tc glConfig.textureCompression = TC_NONE;
if ( Q_stristr( glConfig.extensions_string, "GL_S3_s3tc" ) )
// GL_EXT_texture_compression_s3tc
if ( GLimp_HaveExtension( "GL_ARB_texture_compression" ) &&
GLimp_HaveExtension( "GL_EXT_texture_compression_s3tc" ) )
{ {
if ( r_ext_compressed_textures->value ) if ( r_ext_compressed_textures->value )
{ {
glConfig.textureCompression = TC_S3TC; glConfig.textureCompression = TC_S3TC_ARB;
ri.Printf( PRINT_ALL, "...using GL_S3_s3tc\n" ); ri.Printf( PRINT_ALL, "...using GL_EXT_texture_compression_s3tc\n" );
} }
else else
{ {
glConfig.textureCompression = TC_NONE; ri.Printf( PRINT_ALL, "...ignoring GL_EXT_texture_compression_s3tc\n" );
ri.Printf( PRINT_ALL, "...ignoring GL_S3_s3tc\n" );
} }
} }
else else
{ {
glConfig.textureCompression = TC_NONE; ri.Printf( PRINT_ALL, "...GL_EXT_texture_compression_s3tc not found\n" );
ri.Printf( PRINT_ALL, "...GL_S3_s3tc not found\n" );
} }
// GL_S3_s3tc ... legacy extension before GL_EXT_texture_compression_s3tc.
if (glConfig.textureCompression == TC_NONE)
{
if ( GLimp_HaveExtension( "GL_S3_s3tc" ) )
{
if ( r_ext_compressed_textures->value )
{
glConfig.textureCompression = TC_S3TC;
ri.Printf( PRINT_ALL, "...using GL_S3_s3tc\n" );
}
else
{
ri.Printf( PRINT_ALL, "...ignoring GL_S3_s3tc\n" );
}
}
else
{
ri.Printf( PRINT_ALL, "...GL_S3_s3tc not found\n" );
}
}
// GL_EXT_texture_env_add // GL_EXT_texture_env_add
glConfig.textureEnvAddAvailable = qfalse; glConfig.textureEnvAddAvailable = qfalse;
if ( Q_stristr( glConfig.extensions_string, "EXT_texture_env_add" ) ) if ( GLimp_HaveExtension( "EXT_texture_env_add" ) )
{ {
if ( r_ext_texture_env_add->integer ) if ( r_ext_texture_env_add->integer )
{ {
@ -504,7 +538,7 @@ static void GLimp_InitExtensions( void )
qglMultiTexCoord2fARB = NULL; qglMultiTexCoord2fARB = NULL;
qglActiveTextureARB = NULL; qglActiveTextureARB = NULL;
qglClientActiveTextureARB = NULL; qglClientActiveTextureARB = NULL;
if ( Q_stristr( glConfig.extensions_string, "GL_ARB_multitexture" ) ) if ( GLimp_HaveExtension( "GL_ARB_multitexture" ) )
{ {
if ( r_ext_multitexture->value ) if ( r_ext_multitexture->value )
{ {
@ -541,7 +575,7 @@ static void GLimp_InitExtensions( void )
} }
// GL_EXT_compiled_vertex_array // GL_EXT_compiled_vertex_array
if ( Q_stristr( glConfig.extensions_string, "GL_EXT_compiled_vertex_array" ) ) if ( GLimp_HaveExtension( "GL_EXT_compiled_vertex_array" ) )
{ {
if ( r_ext_compiled_vertex_array->value ) if ( r_ext_compiled_vertex_array->value )
{ {
@ -564,7 +598,7 @@ static void GLimp_InitExtensions( void )
} }
textureFilterAnisotropic = qfalse; textureFilterAnisotropic = qfalse;
if ( strstr( glConfig.extensions_string, "GL_EXT_texture_filter_anisotropic" ) ) if ( GLimp_HaveExtension( "GL_EXT_texture_filter_anisotropic" ) )
{ {
if ( r_ext_texture_filter_anisotropic->integer ) { if ( r_ext_texture_filter_anisotropic->integer ) {
qglGetIntegerv( GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, (GLint *)&maxAnisotropy ); qglGetIntegerv( GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, (GLint *)&maxAnisotropy );