diff --git a/src/client/refresh/vk/header/local.h b/src/client/refresh/vk/header/local.h index b2760ddc..30b2c558 100644 --- a/src/client/refresh/vk/header/local.h +++ b/src/client/refresh/vk/header/local.h @@ -152,7 +152,7 @@ extern cvar_t *vk_pixel_size; extern cvar_t *r_fixsurfsky; extern cvar_t *vid_fullscreen; -extern cvar_t *vid_refresh; +extern cvar_t *vid_renderer; extern cvar_t *vid_gamma; extern int c_visible_lightmaps; diff --git a/src/client/refresh/vk/vk_common.c b/src/client/refresh/vk/vk_common.c index 6038a0ea..ee64bf2d 100644 --- a/src/client/refresh/vk/vk_common.c +++ b/src/client/refresh/vk/vk_common.c @@ -1665,7 +1665,7 @@ void QVk_Restart(void) if (!QVk_Init()) ri.Sys_Error(ERR_FATAL, "Unable to restart Vulkan renderer"); QVk_PostInit(); - vid_refresh->modified = true; + vid_renderer->modified = true; } void QVk_PostInit(void) diff --git a/src/client/refresh/vk/vk_rmain.c b/src/client/refresh/vk/vk_rmain.c index 41322e39..3c0e2958 100644 --- a/src/client/refresh/vk/vk_rmain.c +++ b/src/client/refresh/vk/vk_rmain.c @@ -130,7 +130,7 @@ cvar_t *vk_nolerp_list; cvar_t *r_fixsurfsky; cvar_t *vid_fullscreen; -cvar_t *vid_refresh; +cvar_t *vid_renderer; cvar_t *vid_gamma; static cvar_t *viewsize; @@ -1195,7 +1195,7 @@ R_Register( void ) ri.Cvar_Set("r_msaa_samples", "0"); vid_fullscreen = ri.Cvar_Get("vid_fullscreen", "0", CVAR_ARCHIVE); - vid_refresh = ri.Cvar_Get("vid_refresh", "0", CVAR_NOSET); + vid_renderer = ri.Cvar_Get("vid_renderer", "gl1", CVAR_ARCHIVE); vid_gamma = ri.Cvar_Get("vid_gamma", "1.0", CVAR_ARCHIVE); viewsize = ri.Cvar_Get("viewsize", "100", CVAR_ARCHIVE); diff --git a/src/client/vid/vid.c b/src/client/vid/vid.c index c2c6f61f..e6da7d5b 100644 --- a/src/client/vid/vid.c +++ b/src/client/vid/vid.c @@ -286,7 +286,6 @@ VID_GetModeInfo(int *width, int *height, int mode) // Global console variables. cvar_t *vid_gamma; cvar_t *vid_fullscreen; -cvar_t *vid_refresh; cvar_t *vid_renderer; // Global video state, used throughout the client. @@ -487,13 +486,16 @@ VID_CheckChanges(void) } } + // Ignore possible changes in vid_renderer above. + vid_renderer->modified = false; + // Unblock the client. cls.disable_screen = false; } - if (vid_refresh->modified) + if (vid_renderer->modified) { - vid_refresh->modified = false; + vid_renderer->modified = false; cl.refresh_prepped = false; } } @@ -507,7 +509,6 @@ VID_Init(void) // Console variables vid_gamma = Cvar_Get("vid_gamma", "1.0", CVAR_ARCHIVE); vid_fullscreen = Cvar_Get("vid_fullscreen", "0", CVAR_ARCHIVE); - vid_refresh = Cvar_Get("vid_refresh", "0", CVAR_NOSET); vid_renderer = Cvar_Get("vid_renderer", "gl1", CVAR_ARCHIVE); // Commands