From 0a4da26e4d543253a69d95c86f4495148fea30eb Mon Sep 17 00:00:00 2001 From: Tomi Isoaho Date: Thu, 23 Feb 2012 21:02:41 +0000 Subject: [PATCH] Updated the UI to play nice with r_ext_framebuffer_multisample. --- reaction/code/ui/ui_main.c | 12 ++++++++---- reaction/uifiles/system.menu | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/reaction/code/ui/ui_main.c b/reaction/code/ui/ui_main.c index 3a1c164d..f2ab1bc6 100644 --- a/reaction/code/ui/ui_main.c +++ b/reaction/code/ui/ui_main.c @@ -5666,7 +5666,8 @@ static void UI_Update(const char *name) //TTI: new presets case 0: // high quality trap_Cvar_SetValue("r_allowExtensions", 1); - trap_Cvar_SetValue("r_ext_multisample", 4); + //trap_Cvar_SetValue("r_ext_multisample", 4); + trap_Cvar_SetValue("r_ext_framebuffer_multisample", 4); trap_Cvar_Set("r_texturemode", "GL_LINEAR_MIPMAP_LINEAR"); trap_Cvar_SetValue("r_ext_texture_filter_anisotropic", 1); @@ -5697,7 +5698,8 @@ static void UI_Update(const char *name) break; case 1: // normal trap_Cvar_SetValue("r_allowExtensions", 1); - trap_Cvar_SetValue("r_ext_multisample", 0); + //trap_Cvar_SetValue("r_ext_multisample", 0); + trap_Cvar_SetValue("r_ext_framebuffer_multisample", 0); trap_Cvar_Set("r_texturemode", "GL_LINEAR_MIPMAP_LINEAR"); trap_Cvar_SetValue("r_ext_texture_filter_anisotropic", 0); @@ -5728,7 +5730,8 @@ static void UI_Update(const char *name) break; case 2: // fast trap_Cvar_SetValue("r_allowExtensions", 1); - trap_Cvar_SetValue("r_ext_multisample", 0); + //trap_Cvar_SetValue("r_ext_multisample", 0); + trap_Cvar_SetValue("r_ext_framebuffer_multisample", 0); trap_Cvar_Set("r_texturemode", "GL_LINEAR_MIPMAP_LINEAR"); trap_Cvar_SetValue("r_ext_texture_filter_anisotropic", 0); @@ -5759,7 +5762,8 @@ static void UI_Update(const char *name) break; case 3: // fastest trap_Cvar_SetValue("r_allowExtensions", 1); - trap_Cvar_SetValue("r_ext_multisample", 0); + //trap_Cvar_SetValue("r_ext_multisample", 0); + trap_Cvar_SetValue("r_ext_framebuffer_multisample", 0); trap_Cvar_Set("r_texturemode", "GL_LINEAR_MIPMAP_NEAREST"); trap_Cvar_SetValue("r_ext_texture_filter_anisotropic", 0); diff --git a/reaction/uifiles/system.menu b/reaction/uifiles/system.menu index cd5cf1e6..c903755f 100644 --- a/reaction/uifiles/system.menu +++ b/reaction/uifiles/system.menu @@ -236,7 +236,7 @@ Group # 1 - Graphics // Anti-Aliasing Mode // - BEGIN_OPTION("Anti-Aliasing", "r_ext_multisample", ITEM_TYPE_MULTI, 6, 1) + BEGIN_OPTION("Anti-Aliasing", "r_ext_framebuffer_multisample", ITEM_TYPE_MULTI, 6, 1) cvarFloatList { "Off" 0 "2x MSAA" 2