diff --git a/src/hardware/hw_main.cpp b/src/hardware/hw_main.cpp index 007148aeb..561fd9721 100644 --- a/src/hardware/hw_main.cpp +++ b/src/hardware/hw_main.cpp @@ -5899,7 +5899,7 @@ void HWR_Startup(void) HWR_TogglePaletteRendering(); if (msaa) - GL_SetSpecialState(HWD_SET_MSAA, a2c ? 2 : 1); + GL_SetSpecialState(HWD_SET_MSAA, 1); HWR_RegisterCommands(); } diff --git a/src/hardware/hw_main.h b/src/hardware/hw_main.h index 4856f7574..757cfba6b 100644 --- a/src/hardware/hw_main.h +++ b/src/hardware/hw_main.h @@ -43,7 +43,6 @@ void HWR_Startup(void); void HWR_Shutdown(void); extern unsigned msaa; -extern boolean a2c; extern FTransform atransform; extern float gl_viewsin, gl_viewcos; diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c index 051fbd8f7..048fe95b0 100644 --- a/src/hardware/r_opengl/r_opengl.c +++ b/src/hardware/r_opengl/r_opengl.c @@ -2639,11 +2639,7 @@ void GL_SetSpecialState(hwdspecialstate_t IdState, INT32 Value) case HWD_SET_MSAA: if (Value) - { pglEnable(GL_MULTISAMPLE); - if (Value == 2) - pglEnable(GL_SAMPLE_ALPHA_TO_COVERAGE); - } break; case HWD_SET_TEXTUREANISOTROPICMODE: diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c index 9d85dbb3e..6f66543b4 100644 --- a/src/sdl/i_video.c +++ b/src/sdl/i_video.c @@ -97,11 +97,9 @@ static char vidModeName[33][32]; // allow 33 different modes rendermode_t rendermode = render_none; #ifdef HWRENDER -unsigned msaa = 0; - // Eee probably the way i organize it isn't best >< // Just don't know where do i put declaration and "implementation" -boolean a2c = false; +unsigned msaa = 0; #endif static void KeyboardLayout_OnChange(void) @@ -1810,7 +1808,6 @@ void I_StartupGraphics(void) rendermode = render_opengl; msaa = 0; boolean msaa_set = false; - a2c = false; boolean a2c_set = false; // MSAA antialiasing if (M_CheckParm("-msaa") && M_IsNextParm()) @@ -1822,16 +1819,6 @@ void I_StartupGraphics(void) } } - if (M_CheckParm("-a2c")) - { - a2c = true; - a2c_set = true; - } - else if (M_CheckParm("-noa2c")) - { - a2c_set = true; - } - { char line[16]; char * word; @@ -1879,15 +1866,6 @@ void I_StartupGraphics(void) } } } - - if (!a2c_set) - { - if (fasticmp(word, "a2c")) - { - a2c = true; - CONS_Printf("Using a2c because it was specified to be used earlier\n"); - } - } } fclose(file); @@ -1922,9 +1900,6 @@ void I_StartupGraphics(void) #ifdef HWRENDER fprintf(file, "msaa %u\n", msaa); - - if (a2c) - fputs("a2c\n", file); #endif fclose(file); }