mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-23 12:32:34 +00:00
Remove gl_vid_multisample
This commit is contained in:
parent
bb066f6f07
commit
945d5b154a
3 changed files with 3 additions and 26 deletions
|
@ -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)
|
EXTERN_CVAR(Bool, gl_smooth_rendered)
|
||||||
|
|
||||||
|
|
||||||
|
@ -1259,7 +1254,7 @@ void I_InitGraphics()
|
||||||
val.Bool = !!Args->CheckParm("-devparm");
|
val.Bool = !!Args->CheckParm("-devparm");
|
||||||
ticker.SetGenericRepDefault(val, CVAR_Bool);
|
ticker.SetGenericRepDefault(val, CVAR_Bool);
|
||||||
|
|
||||||
Video = new CocoaVideo(gl_vid_multisample);
|
Video = new CocoaVideo(0);
|
||||||
atterm(I_ShutdownGraphics);
|
atterm(I_ShutdownGraphics);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -54,11 +54,6 @@ EXTERN_CVAR (Bool, cl_capfps)
|
||||||
|
|
||||||
// PUBLIC DATA DEFINITIONS -------------------------------------------------
|
// 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)
|
CUSTOM_CVAR(Bool, gl_debug, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
|
||||||
{
|
{
|
||||||
Printf("This won't take effect until " GAMENAME " is restarted.\n");
|
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)
|
SDLGLFB::SDLGLFB (void *, int width, int height, int, int, bool fullscreen)
|
||||||
: DFrameBuffer (width, height)
|
: DFrameBuffer (width, height)
|
||||||
{
|
{
|
||||||
static int localmultisample=-1;
|
|
||||||
|
|
||||||
if (localmultisample<0) localmultisample=gl_vid_multisample;
|
|
||||||
|
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
m_Lock=0;
|
m_Lock=0;
|
||||||
|
|
||||||
UpdatePending = false;
|
UpdatePending = false;
|
||||||
|
|
||||||
if (!static_cast<SDLGLVideo*>(Video)->InitHardware(false, localmultisample))
|
if (!static_cast<SDLGLVideo*>(Video)->InitHardware(false, 0))
|
||||||
{
|
{
|
||||||
vid_renderer = 0;
|
vid_renderer = 0;
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -40,11 +40,6 @@ PFNWGLCREATECONTEXTATTRIBSARBPROC myWglCreateContextAttribsARB;
|
||||||
PFNWGLSWAPINTERVALEXTPROC vsyncfunc;
|
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)
|
CUSTOM_CVAR(Bool, gl_debug, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
|
||||||
{
|
{
|
||||||
Printf("This won't take effect until " GAMENAME " is restarted.\n");
|
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)
|
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_Width = width;
|
||||||
m_Height = height;
|
m_Height = height;
|
||||||
m_Bits = bits;
|
m_Bits = bits;
|
||||||
|
@ -981,7 +972,7 @@ Win32GLFrameBuffer::Win32GLFrameBuffer(void *hMonitor, int width, int height, in
|
||||||
I_RestoreWindowedPos();
|
I_RestoreWindowedPos();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!static_cast<Win32GLVideo *>(Video)->InitHardware(Window, localmultisample))
|
if (!static_cast<Win32GLVideo *>(Video)->InitHardware(Window, 0))
|
||||||
{
|
{
|
||||||
vid_renderer = 0;
|
vid_renderer = 0;
|
||||||
return;
|
return;
|
||||||
|
|
Loading…
Reference in a new issue