server: ignore out of order prespawn/spawn/begin commands

[xonotic/darkplaces.git] / vid_shared.c

diff --git a/vid_shared.c b/vid_shared.c
index 9f24869d4cea01848a8ca44551fea8bdd8cdd921..f5987e788025d613d93a5e314cccb7282400f887 100644 (file)
--- a/vid_shared.c
+++ b/vid_shared.c
@@ -867,26 +867,26 @@ static dllfunction_t vbofuncs[] =
 
 static dllfunction_t arbfbofuncs[] =
 {
-       {"glIsRenderbufferARB"                      , (void **) &qglIsRenderbuffer},
-       {"glBindRenderbufferARB"                    , (void **) &qglBindRenderbuffer},
-       {"glDeleteRenderbuffersARB"                 , (void **) &qglDeleteRenderbuffers},
-       {"glGenRenderbuffersARB"                    , (void **) &qglGenRenderbuffers},
-       {"glRenderbufferStorageARB"                 , (void **) &qglRenderbufferStorage},
-       {"glRenderbufferStorageMultisampleARB"      , (void **) &qglRenderbufferStorageMultisample}, // not in GL_EXT_framebuffer_object
-       {"glGetRenderbufferParameterivARB"          , (void **) &qglGetRenderbufferParameteriv},
-       {"glIsFramebufferARB"                       , (void **) &qglIsFramebuffer},
-       {"glBindFramebufferARB"                     , (void **) &qglBindFramebuffer},
-       {"glDeleteFramebuffersARB"                  , (void **) &qglDeleteFramebuffers},
-       {"glGenFramebuffersARB"                     , (void **) &qglGenFramebuffers},
-       {"glCheckFramebufferStatusARB"              , (void **) &qglCheckFramebufferStatus},
-       {"glFramebufferTexture1DARB"                , (void **) &qglFramebufferTexture1D},
-       {"glFramebufferTexture2DARB"                , (void **) &qglFramebufferTexture2D},
-       {"glFramebufferTexture3DARB"                , (void **) &qglFramebufferTexture3D},
-       {"glFramebufferTextureLayerARB"             , (void **) &qglFramebufferTextureLayer}, // not in GL_EXT_framebuffer_object
-       {"glFramebufferRenderbufferARB"             , (void **) &qglFramebufferRenderbuffer},
-       {"glGetFramebufferAttachmentParameterivARB" , (void **) &qglGetFramebufferAttachmentParameteriv},
-       {"glBlitFramebufferARB"                     , (void **) &qglBlitFramebuffer}, // not in GL_EXT_framebuffer_object
-       {"glGenerateMipmapARB"                      , (void **) &qglGenerateMipmap},
+       {"glIsRenderbuffer"                      , (void **) &qglIsRenderbuffer},
+       {"glBindRenderbuffer"                    , (void **) &qglBindRenderbuffer},
+       {"glDeleteRenderbuffers"                 , (void **) &qglDeleteRenderbuffers},
+       {"glGenRenderbuffers"                    , (void **) &qglGenRenderbuffers},
+       {"glRenderbufferStorage"                 , (void **) &qglRenderbufferStorage},
+       {"glRenderbufferStorageMultisample"      , (void **) &qglRenderbufferStorageMultisample}, // not in GL_EXT_framebuffer_object
+       {"glGetRenderbufferParameteriv"          , (void **) &qglGetRenderbufferParameteriv},
+       {"glIsFramebuffer"                       , (void **) &qglIsFramebuffer},
+       {"glBindFramebuffer"                     , (void **) &qglBindFramebuffer},
+       {"glDeleteFramebuffers"                  , (void **) &qglDeleteFramebuffers},
+       {"glGenFramebuffers"                     , (void **) &qglGenFramebuffers},
+       {"glCheckFramebufferStatus"              , (void **) &qglCheckFramebufferStatus},
+       {"glFramebufferTexture1D"                , (void **) &qglFramebufferTexture1D},
+       {"glFramebufferTexture2D"                , (void **) &qglFramebufferTexture2D},
+       {"glFramebufferTexture3D"                , (void **) &qglFramebufferTexture3D},
+       {"glFramebufferTextureLayer"             , (void **) &qglFramebufferTextureLayer}, // not in GL_EXT_framebuffer_object
+       {"glFramebufferRenderbuffer"             , (void **) &qglFramebufferRenderbuffer},
+       {"glGetFramebufferAttachmentParameteriv" , (void **) &qglGetFramebufferAttachmentParameteriv},
+       {"glBlitFramebuffer"                     , (void **) &qglBlitFramebuffer}, // not in GL_EXT_framebuffer_object
+       {"glGenerateMipmap"                      , (void **) &qglGenerateMipmap},
        {NULL, NULL}
 };
 
@@ -1038,6 +1038,7 @@ void VID_CheckExtensions(void)
                vid.support.ext_framebuffer_object = true;
        else
                vid.support.ext_framebuffer_object = GL_CheckExtension("GL_EXT_framebuffer_object", extfbofuncs, "-nofbo", false);
+
        vid.support.ext_packed_depth_stencil = GL_CheckExtension("GL_EXT_packed_depth_stencil", NULL, "-nopackeddepthstencil", false);
        vid.support.ext_stencil_two_side = GL_CheckExtension("GL_EXT_stencil_two_side", stenciltwosidefuncs, "-nostenciltwoside", false);
        vid.support.ext_texture_3d = GL_CheckExtension("GL_EXT_texture3D", texture3dextfuncs, "-notexture3d", false);
@@ -1816,7 +1817,7 @@ static int VID_Mode(int fullscreen, int width, int height, int bpp, float refres
                        (vid_sRGB_fallback.integer >= 3) // force fallback
                        ||
                        (vid_sRGB_fallback.integer >= 2 && // fallback if framebuffer is 8bit
-                               !(r_viewfbo.integer >= 2 && vid.support.ext_framebuffer_object && vid.samples < 2))
+                               !(r_viewfbo.integer >= 2 && vid.support.ext_framebuffer_object && vid.support.arb_texture_non_power_of_two && vid.samples < 2))
                )
                        vid.sRGB2D = vid.sRGB3D = false;
 
@@ -1865,7 +1866,7 @@ void VID_Restart_f(void)
 
        if (!vid_opened)
        {
-               SCR_BeginLoadingPlaque();
+               SCR_BeginLoadingPlaque(false);
                return;
        }
 
@@ -2042,6 +2043,7 @@ void VID_Soft_SharedSetup(void)
        vid.support.ext_blend_subtract = true;
        vid.support.ext_draw_range_elements = true;
        vid.support.ext_framebuffer_object = true;
+
        vid.support.ext_texture_3d = true;
        //vid.support.ext_texture_compression_s3tc = true;
        vid.support.ext_texture_filter_anisotropic = true;