YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-01-12 16:18:01 +00:00
Code Issues Projects Releases Wiki Activity

ref_gl: fix build with XASH_GL_STATIC, avoid using ARB shader extension on core context

Browse Source
This commit is contained in:
mittorn 2023-10-05 18:57:26 +03:00 committed by Alibek Omarov
parent 8c88e82709
commit 73087ead2d
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ref/gl/gl_opengl.c
View File

@ -247,7 +247,7 @@ static dllfunc_t drawrangeelementsextfuncs[] =
{ NULL, NULL } { NULL, NULL }
}; };
#ifndef XASH_GL_STATIC
static dllfunc_t shaderobjectsfuncs[] = static dllfunc_t shaderobjectsfuncs[] =
{ {
{ GL_CALL( glDeleteObjectARB ) }, { GL_CALL( glDeleteObjectARB ) },
@ -360,8 +360,6 @@ static dllfunc_t shaderobjectsfuncs_gles[] =
{ NULL, NULL } { NULL, NULL }
}; };
#ifndef XASH_GL_STATIC
static dllfunc_t vaofuncs[] = static dllfunc_t vaofuncs[] =
{ {
{ "glBindVertexArray" , (void **)&pglBindVertexArray }, { "glBindVertexArray" , (void **)&pglBindVertexArray },
@ -715,12 +713,14 @@ void GL_InitExtensionsGLES( void )
case GL_ARB_TEXTURE_NPOT_EXT: case GL_ARB_TEXTURE_NPOT_EXT:
GL_CheckExtension( "GL_OES_texture_npot", NULL, "gl_texture_npot", extid ); GL_CheckExtension( "GL_OES_texture_npot", NULL, "gl_texture_npot", extid );
break; break;
#ifndef XASH_GL_STATIC
case GL_SHADER_OBJECTS_EXT: case GL_SHADER_OBJECTS_EXT:
GL_CheckExtension( "ES2 Shaders", shaderobjectsfuncs_gles, "gl_shaderobjects", extid ); GL_CheckExtension( "ES2 Shaders", shaderobjectsfuncs_gles, "gl_shaderobjects", extid );
break; break;
case GL_ARB_VERTEX_ARRAY_OBJECT_EXT: case GL_ARB_VERTEX_ARRAY_OBJECT_EXT:
GL_CheckExtension( "vertex_array_object", vaofuncs, "gl_vertex_array_object", extid ); GL_CheckExtension( "vertex_array_object", vaofuncs, "gl_vertex_array_object", extid );
break; break;
#endif
case GL_DEBUG_OUTPUT: case GL_DEBUG_OUTPUT:
if( glw_state.extended ) if( glw_state.extended )
GL_CheckExtension( "GL_KHR_debug", NULL, NULL, extid ); GL_CheckExtension( "GL_KHR_debug", NULL, NULL, extid );
@ -742,7 +742,9 @@ void GL_InitExtensionsGLES( void )
GL_SetExtension( extid, false ); GL_SetExtension( extid, false );
} }
} }
#ifndef XASH_GL_STATIC
GL2_ShimInit(); GL2_ShimInit();
#endif
} }
#else #else
void GL_InitExtensionsBigGL( void ) void GL_InitExtensionsBigGL( void )
@ -839,9 +841,13 @@ void GL_InitExtensionsBigGL( void )
GL_CheckExtension( "GL_ARB_vertex_buffer_object", vbofuncs, "gl_vertex_buffer_object", GL_ARB_VERTEX_BUFFER_OBJECT_EXT ); GL_CheckExtension( "GL_ARB_vertex_buffer_object", vbofuncs, "gl_vertex_buffer_object", GL_ARB_VERTEX_BUFFER_OBJECT_EXT );
GL_CheckExtension( "GL_ARB_texture_multisample", multisampletexfuncs, "gl_texture_multisample", GL_TEXTURE_MULTISAMPLE ); GL_CheckExtension( "GL_ARB_texture_multisample", multisampletexfuncs, "gl_texture_multisample", GL_TEXTURE_MULTISAMPLE );
GL_CheckExtension( "GL_ARB_texture_compression_bptc", NULL, "gl_texture_bptc_compression", GL_ARB_TEXTURE_COMPRESSION_BPTC ); GL_CheckExtension( "GL_ARB_texture_compression_bptc", NULL, "gl_texture_bptc_compression", GL_ARB_TEXTURE_COMPRESSION_BPTC );
GL_CheckExtension( "GL_ARB_shader_objects", shaderobjectsfuncs, "gl_shaderobjects", GL_SHADER_OBJECTS_EXT ); #ifndef XASH_GL_STATIC
if(glConfig.context == CONTEXT_TYPE_GL_CORE )
GL_CheckExtension( "shader_objects", shaderobjectsfuncs_gles, "gl_shaderobjects", GL_SHADER_OBJECTS_EXT );
else
GL_CheckExtension( "GL_ARB_shader_objects", shaderobjectsfuncs, "gl_shaderobjects", GL_SHADER_OBJECTS_EXT );
GL_CheckExtension( "GL_ARB_vertex_array_object", vaofuncs, "gl_vertex_array_object", GL_ARB_VERTEX_ARRAY_OBJECT_EXT ); GL_CheckExtension( "GL_ARB_vertex_array_object", vaofuncs, "gl_vertex_array_object", GL_ARB_VERTEX_ARRAY_OBJECT_EXT );
#endif
if( GL_CheckExtension( "GL_ARB_shading_language_100", NULL, NULL, GL_SHADER_GLSL100_EXT )) if( GL_CheckExtension( "GL_ARB_shading_language_100", NULL, NULL, GL_SHADER_GLSL100_EXT ))
{ {
pglGetIntegerv( GL_MAX_TEXTURE_COORDS_ARB, &glConfig.max_texture_coords ); pglGetIntegerv( GL_MAX_TEXTURE_COORDS_ARB, &glConfig.max_texture_coords );