From 945d5b154a3f810d79bda16b14f9574e3e45118e Mon Sep 17 00:00:00 2001
From: Magnus Norddahl <dpjudas@users.noreply.github.com>
Date: Sun, 28 Aug 2016 18:10:39 +0200
Subject: [PATCH] Remove gl_vid_multisample

---
 src/posix/cocoa/i_video.mm   |  7 +------
 src/posix/sdl/sdlglvideo.cpp | 11 +----------
 src/win32/win32gliface.cpp   | 11 +----------
 3 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/src/posix/cocoa/i_video.mm b/src/posix/cocoa/i_video.mm
index 8f8b7c1355..e2b59449d7 100644
--- a/src/posix/cocoa/i_video.mm
+++ b/src/posix/cocoa/i_video.mm
@@ -149,11 +149,6 @@ CUSTOM_CVAR(Int, vid_renderer, 1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINIT
 	}
 }
 
-CUSTOM_CVAR(Int, gl_vid_multisample, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
-{
-	Printf("This won't take effect until " GAMENAME " is restarted.\n");
-}
-
 EXTERN_CVAR(Bool, gl_smooth_rendered)
 
 
@@ -1259,7 +1254,7 @@ void I_InitGraphics()
 	val.Bool = !!Args->CheckParm("-devparm");
 	ticker.SetGenericRepDefault(val, CVAR_Bool);
 
-	Video = new CocoaVideo(gl_vid_multisample);
+	Video = new CocoaVideo(0);
 	atterm(I_ShutdownGraphics);
 }
 
diff --git a/src/posix/sdl/sdlglvideo.cpp b/src/posix/sdl/sdlglvideo.cpp
index 0cd6b223b6..d8c00f2363 100644
--- a/src/posix/sdl/sdlglvideo.cpp
+++ b/src/posix/sdl/sdlglvideo.cpp
@@ -54,11 +54,6 @@ EXTERN_CVAR (Bool, cl_capfps)
 
 // PUBLIC DATA DEFINITIONS -------------------------------------------------
 
-CUSTOM_CVAR(Int, gl_vid_multisample, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL )
-{
-	Printf("This won't take effect until " GAMENAME " is restarted.\n");
-}
-
 CUSTOM_CVAR(Bool, gl_debug, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
 {
 	Printf("This won't take effect until " GAMENAME " is restarted.\n");
@@ -322,17 +317,13 @@ bool SDLGLVideo::InitHardware (bool allowsoftware, int multisample)
 SDLGLFB::SDLGLFB (void *, int width, int height, int, int, bool fullscreen)
 	: DFrameBuffer (width, height)
 {
-	static int localmultisample=-1;
-
-	if (localmultisample<0) localmultisample=gl_vid_multisample;
-
 	int i;
 	
 	m_Lock=0;
 
 	UpdatePending = false;
 	
-	if (!static_cast<SDLGLVideo*>(Video)->InitHardware(false, localmultisample))
+	if (!static_cast<SDLGLVideo*>(Video)->InitHardware(false, 0))
 	{
 		vid_renderer = 0;
 		return;
diff --git a/src/win32/win32gliface.cpp b/src/win32/win32gliface.cpp
index bec2a19cf1..23f1565925 100644
--- a/src/win32/win32gliface.cpp
+++ b/src/win32/win32gliface.cpp
@@ -40,11 +40,6 @@ PFNWGLCREATECONTEXTATTRIBSARBPROC myWglCreateContextAttribsARB;
 PFNWGLSWAPINTERVALEXTPROC vsyncfunc;
 
 
-CUSTOM_CVAR(Int, gl_vid_multisample, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL )
-{
-	Printf("This won't take effect until " GAMENAME " is restarted.\n");
-}
-
 CUSTOM_CVAR(Bool, gl_debug, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
 {
 	Printf("This won't take effect until " GAMENAME " is restarted.\n");
@@ -911,10 +906,6 @@ IMPLEMENT_ABSTRACT_CLASS(Win32GLFrameBuffer)
 
 Win32GLFrameBuffer::Win32GLFrameBuffer(void *hMonitor, int width, int height, int bits, int refreshHz, bool fullscreen) : BaseWinFB(width, height) 
 {
-	static int localmultisample=-1;
-	
-	if (localmultisample<0) localmultisample=gl_vid_multisample;
-
 	m_Width = width;
 	m_Height = height;
 	m_Bits = bits;
@@ -981,7 +972,7 @@ Win32GLFrameBuffer::Win32GLFrameBuffer(void *hMonitor, int width, int height, in
 		I_RestoreWindowedPos();
 	}
 
-	if (!static_cast<Win32GLVideo *>(Video)->InitHardware(Window, localmultisample))
+	if (!static_cast<Win32GLVideo *>(Video)->InitHardware(Window, 0))
 	{
 		vid_renderer = 0;
 		return;