Updated the UI to play nice with r_ext_framebuffer_multisample.

This commit is contained in:
Tomi Isoaho 2012-02-23 21:02:41 +00:00
parent e244db27e5
commit 0a4da26e4d
2 changed files with 9 additions and 5 deletions

View file

@ -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);

View file

@ -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