teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2025-01-31 13:00:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't check fixed function GL extensions when using shader pipeline

Browse source 
GL_TEXTURE_UNITS_ARB is not part of OpenGL ES 2 API and sets GL error.
It's not part of OpenGL 3.2 core profile either.
This commit is contained in:
Zack Middleton 2018-07-20 23:40:26 -05:00
parent d861a4f427
commit 658165cfbb
2 changed files with 77 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
code/renderergl2/tr_init.c
View file

@ -261,6 +261,8 @@ static void InitOpenGL( void )
GLimp_Init( qfalse ); GLimp_Init( qfalse );
GLimp_InitExtraExtensions(); GLimp_InitExtraExtensions();
glConfig.textureEnvAddAvailable = qtrue;
// OpenGL driver constants // OpenGL driver constants
qglGetIntegerv( GL_MAX_TEXTURE_SIZE, &temp ); qglGetIntegerv( GL_MAX_TEXTURE_SIZE, &temp );
glConfig.maxTextureSize = temp; glConfig.maxTextureSize = temp;
@ -270,6 +272,9 @@ static void InitOpenGL( void )
{ {
glConfig.maxTextureSize = 0; glConfig.maxTextureSize = 0;
} }
qglGetIntegerv( GL_MAX_TEXTURE_IMAGE_UNITS, &temp );
glConfig.numTextureUnits = temp;
} }
// set default state // set default state
@ -1044,7 +1049,7 @@ void GfxInfo_f( void )
} }
ri.Printf( PRINT_ALL, "\n" ); ri.Printf( PRINT_ALL, "\n" );
ri.Printf( PRINT_ALL, "GL_MAX_TEXTURE_SIZE: %d\n", glConfig.maxTextureSize ); ri.Printf( PRINT_ALL, "GL_MAX_TEXTURE_SIZE: %d\n", glConfig.maxTextureSize );
ri.Printf( PRINT_ALL, "GL_MAX_TEXTURE_UNITS_ARB: %d\n", glConfig.numTextureUnits ); ri.Printf( PRINT_ALL, "GL_MAX_TEXTURE_IMAGE_UNITS: %d\n", glConfig.numTextureUnits );
ri.Printf( PRINT_ALL, "\nPIXELFORMAT: color(%d-bits) Z(%d-bit) stencil(%d-bits)\n", glConfig.colorBits, glConfig.depthBits, glConfig.stencilBits ); ri.Printf( PRINT_ALL, "\nPIXELFORMAT: color(%d-bits) Z(%d-bit) stencil(%d-bits)\n", glConfig.colorBits, glConfig.depthBits, glConfig.stencilBits );
ri.Printf( PRINT_ALL, "MODE: %d, %d x %d %s hz:", r_mode->integer, glConfig.vidWidth, glConfig.vidHeight, fsstrings[r_fullscreen->integer == 1] ); ri.Printf( PRINT_ALL, "MODE: %d, %d x %d %s hz:", r_mode->integer, glConfig.vidWidth, glConfig.vidHeight, fsstrings[r_fullscreen->integer == 1] );
if ( glConfig.displayFrequency ) if ( glConfig.displayFrequency )

139
code/sdl/sdl_glimp.c
View file

@ -802,7 +802,7 @@ static qboolean GLimp_StartDriverAndSetMode(int mode, qboolean fullscreen, qbool
GLimp_InitExtensions GLimp_InitExtensions
=============== ===============
*/ */
static void GLimp_InitExtensions( void ) static void GLimp_InitExtensions( qboolean fixedFunction )
{ {
if ( !r_allowExtensions->integer ) if ( !r_allowExtensions->integer )
{ {
@ -854,88 +854,91 @@ static void GLimp_InitExtensions( void )
} }
} }
// OpenGL 1 fixed function pipeline
// GL_EXT_texture_env_add if ( fixedFunction )
glConfig.textureEnvAddAvailable = qfalse;
if ( SDL_GL_ExtensionSupported( "GL_EXT_texture_env_add" ) )
{ {
if ( r_ext_texture_env_add->integer ) // GL_EXT_texture_env_add
glConfig.textureEnvAddAvailable = qfalse;
if ( SDL_GL_ExtensionSupported( "GL_EXT_texture_env_add" ) )
{ {
glConfig.textureEnvAddAvailable = qtrue; if ( r_ext_texture_env_add->integer )
ri.Printf( PRINT_ALL, "...using GL_EXT_texture_env_add\n" );
}
else
{
glConfig.textureEnvAddAvailable = qfalse;
ri.Printf( PRINT_ALL, "...ignoring GL_EXT_texture_env_add\n" );
}
}
else
{
ri.Printf( PRINT_ALL, "...GL_EXT_texture_env_add not found\n" );
}
// GL_ARB_multitexture
qglMultiTexCoord2fARB = NULL;
qglActiveTextureARB = NULL;
qglClientActiveTextureARB = NULL;
if ( SDL_GL_ExtensionSupported( "GL_ARB_multitexture" ) )
{
if ( r_ext_multitexture->value )
{
qglMultiTexCoord2fARB = SDL_GL_GetProcAddress( "glMultiTexCoord2fARB" );
qglActiveTextureARB = SDL_GL_GetProcAddress( "glActiveTextureARB" );
qglClientActiveTextureARB = SDL_GL_GetProcAddress( "glClientActiveTextureARB" );
if ( qglActiveTextureARB )
{ {
GLint glint = 0; glConfig.textureEnvAddAvailable = qtrue;
qglGetIntegerv( GL_MAX_TEXTURE_UNITS_ARB, &glint ); ri.Printf( PRINT_ALL, "...using GL_EXT_texture_env_add\n" );
glConfig.numTextureUnits = (int) glint; }
if ( glConfig.numTextureUnits > 1 ) else
{ {
ri.Printf( PRINT_ALL, "...using GL_ARB_multitexture\n" ); glConfig.textureEnvAddAvailable = qfalse;
} ri.Printf( PRINT_ALL, "...ignoring GL_EXT_texture_env_add\n" );
else
{
qglMultiTexCoord2fARB = NULL;
qglActiveTextureARB = NULL;
qglClientActiveTextureARB = NULL;
ri.Printf( PRINT_ALL, "...not using GL_ARB_multitexture, < 2 texture units\n" );
}
} }
} }
else else
{ {
ri.Printf( PRINT_ALL, "...ignoring GL_ARB_multitexture\n" ); ri.Printf( PRINT_ALL, "...GL_EXT_texture_env_add not found\n" );
} }
}
else
{
ri.Printf( PRINT_ALL, "...GL_ARB_multitexture not found\n" );
}
// GL_EXT_compiled_vertex_array // GL_ARB_multitexture
if ( SDL_GL_ExtensionSupported( "GL_EXT_compiled_vertex_array" ) ) qglMultiTexCoord2fARB = NULL;
{ qglActiveTextureARB = NULL;
if ( r_ext_compiled_vertex_array->value ) qglClientActiveTextureARB = NULL;
if ( SDL_GL_ExtensionSupported( "GL_ARB_multitexture" ) )
{ {
ri.Printf( PRINT_ALL, "...using GL_EXT_compiled_vertex_array\n" ); if ( r_ext_multitexture->value )
qglLockArraysEXT = ( void ( APIENTRY * )( GLint, GLint ) ) SDL_GL_GetProcAddress( "glLockArraysEXT" );
qglUnlockArraysEXT = ( void ( APIENTRY * )( void ) ) SDL_GL_GetProcAddress( "glUnlockArraysEXT" );
if (!qglLockArraysEXT || !qglUnlockArraysEXT)
{ {
ri.Error (ERR_FATAL, "bad getprocaddress"); qglMultiTexCoord2fARB = SDL_GL_GetProcAddress( "glMultiTexCoord2fARB" );
qglActiveTextureARB = SDL_GL_GetProcAddress( "glActiveTextureARB" );
qglClientActiveTextureARB = SDL_GL_GetProcAddress( "glClientActiveTextureARB" );
if ( qglActiveTextureARB )
{
GLint glint = 0;
qglGetIntegerv( GL_MAX_TEXTURE_UNITS_ARB, &glint );
glConfig.numTextureUnits = (int) glint;
if ( glConfig.numTextureUnits > 1 )
{
ri.Printf( PRINT_ALL, "...using GL_ARB_multitexture\n" );
}
else
{
qglMultiTexCoord2fARB = NULL;
qglActiveTextureARB = NULL;
qglClientActiveTextureARB = NULL;
ri.Printf( PRINT_ALL, "...not using GL_ARB_multitexture, < 2 texture units\n" );
}
}
}
else
{
ri.Printf( PRINT_ALL, "...ignoring GL_ARB_multitexture\n" );
} }
} }
else else
{ {
ri.Printf( PRINT_ALL, "...ignoring GL_EXT_compiled_vertex_array\n" ); ri.Printf( PRINT_ALL, "...GL_ARB_multitexture not found\n" );
}
// GL_EXT_compiled_vertex_array
if ( SDL_GL_ExtensionSupported( "GL_EXT_compiled_vertex_array" ) )
{
if ( r_ext_compiled_vertex_array->value )
{
ri.Printf( PRINT_ALL, "...using GL_EXT_compiled_vertex_array\n" );
qglLockArraysEXT = ( void ( APIENTRY * )( GLint, GLint ) ) SDL_GL_GetProcAddress( "glLockArraysEXT" );
qglUnlockArraysEXT = ( void ( APIENTRY * )( void ) ) SDL_GL_GetProcAddress( "glUnlockArraysEXT" );
if (!qglLockArraysEXT || !qglUnlockArraysEXT)
{
ri.Error (ERR_FATAL, "bad getprocaddress");
}
}
else
{
ri.Printf( PRINT_ALL, "...ignoring GL_EXT_compiled_vertex_array\n" );
}
}
else
{
ri.Printf( PRINT_ALL, "...GL_EXT_compiled_vertex_array not found\n" );
} }
}
else
{
ri.Printf( PRINT_ALL, "...GL_EXT_compiled_vertex_array not found\n" );
} }
textureFilterAnisotropic = qfalse; textureFilterAnisotropic = qfalse;
@ -1064,7 +1067,7 @@ success:
} }
// initialize extensions // initialize extensions
GLimp_InitExtensions( ); GLimp_InitExtensions( fixedFunction );
ri.Cvar_Get( "r_availableModes", "", CVAR_ROM ); ri.Cvar_Get( "r_availableModes", "", CVAR_ROM );