OpenGL2: Disable GL_ARB_seamless_cube_map by default, caused huge frame drops on some hardware

This commit is contained in:
SmileTheory 2013-09-20 17:20:36 -07:00
parent fcaab903d1
commit 82be4e667f
3 changed files with 7 additions and 2 deletions

View File

@ -701,8 +701,10 @@ void GLimp_InitExtraExtensions()
glRefConfig.seamlessCubeMap = qfalse; glRefConfig.seamlessCubeMap = qfalse;
if( GLimp_HaveExtension( extension ) ) if( GLimp_HaveExtension( extension ) )
{ {
if (r_arb_seamless_cube_map->integer)
glRefConfig.seamlessCubeMap = qtrue; glRefConfig.seamlessCubeMap = qtrue;
ri.Printf(PRINT_ALL, result[1], extension);
ri.Printf(PRINT_ALL, result[glRefConfig.seamlessCubeMap], extension);
} }
else else
{ {

View File

@ -100,6 +100,7 @@ cvar_t *r_ext_framebuffer_object;
cvar_t *r_ext_texture_float; cvar_t *r_ext_texture_float;
cvar_t *r_arb_half_float_pixel; cvar_t *r_arb_half_float_pixel;
cvar_t *r_ext_framebuffer_multisample; cvar_t *r_ext_framebuffer_multisample;
cvar_t *r_arb_seamless_cube_map;
cvar_t *r_mergeMultidraws; cvar_t *r_mergeMultidraws;
cvar_t *r_mergeLeafSurfaces; cvar_t *r_mergeLeafSurfaces;
@ -1133,6 +1134,7 @@ void R_Register( void )
r_ext_texture_float = ri.Cvar_Get( "r_ext_texture_float", "1", CVAR_ARCHIVE | CVAR_LATCH); r_ext_texture_float = ri.Cvar_Get( "r_ext_texture_float", "1", CVAR_ARCHIVE | CVAR_LATCH);
r_arb_half_float_pixel = ri.Cvar_Get( "r_arb_half_float_pixel", "1", CVAR_ARCHIVE | CVAR_LATCH); r_arb_half_float_pixel = ri.Cvar_Get( "r_arb_half_float_pixel", "1", CVAR_ARCHIVE | CVAR_LATCH);
r_ext_framebuffer_multisample = ri.Cvar_Get( "r_ext_framebuffer_multisample", "0", CVAR_ARCHIVE | CVAR_LATCH); r_ext_framebuffer_multisample = ri.Cvar_Get( "r_ext_framebuffer_multisample", "0", CVAR_ARCHIVE | CVAR_LATCH);
r_arb_seamless_cube_map = ri.Cvar_Get( "r_arb_seamless_cube_map", "0", CVAR_ARCHIVE | CVAR_LATCH);
r_ext_texture_filter_anisotropic = ri.Cvar_Get( "r_ext_texture_filter_anisotropic", r_ext_texture_filter_anisotropic = ri.Cvar_Get( "r_ext_texture_filter_anisotropic",
"0", CVAR_ARCHIVE | CVAR_LATCH ); "0", CVAR_ARCHIVE | CVAR_LATCH );

View File

@ -1915,6 +1915,7 @@ extern cvar_t *r_ext_framebuffer_object;
extern cvar_t *r_ext_texture_float; extern cvar_t *r_ext_texture_float;
extern cvar_t *r_arb_half_float_pixel; extern cvar_t *r_arb_half_float_pixel;
extern cvar_t *r_ext_framebuffer_multisample; extern cvar_t *r_ext_framebuffer_multisample;
extern cvar_t *r_arb_seamless_cube_map;
extern cvar_t *r_nobind; // turns off binding to appropriate textures extern cvar_t *r_nobind; // turns off binding to appropriate textures
extern cvar_t *r_singleShader; // make most world faces use default shader extern cvar_t *r_singleShader; // make most world faces use default shader