X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=vid_shared.c;h=7d8485c336cb7f091acf576d8f02054caf115ea2;hb=fab85f5a2f069a880e192fb941bef8fd29f2d41f;hp=0859617f5f906c45e51aa189785376f40785f298;hpb=fec24b7a98657412f8403d7edb06bd17f0ff007c;p=xonotic%2Fdarkplaces.git

diff --git a/vid_shared.c b/vid_shared.c
index 0859617f..7d8485c3 100644
--- a/vid_shared.c
+++ b/vid_shared.c
@@ -1038,6 +1038,14 @@ 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);
+
+	// FIXME remove this workaround once FBO + npot texture mapping is fixed
+	if(!vid.support.arb_texture_non_power_of_two)
+	{
+		vid.support.arb_framebuffer_object = false;
+		vid.support.ext_framebuffer_object = 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);
@@ -1865,7 +1873,7 @@ void VID_Restart_f(void)
 
 	if (!vid_opened)
 	{
-		SCR_BeginLoadingPlaque();
+		SCR_BeginLoadingPlaque(false);
 		return;
 	}
 
@@ -2042,6 +2050,14 @@ void VID_Soft_SharedSetup(void)
 	vid.support.ext_blend_subtract = true;
 	vid.support.ext_draw_range_elements = true;
 	vid.support.ext_framebuffer_object = true;
+
+	// FIXME remove this workaround once FBO + npot texture mapping is fixed
+	if(!vid.support.arb_texture_non_power_of_two)
+	{
+		vid.support.arb_framebuffer_object = false;
+		vid.support.ext_framebuffer_object = false;
+	}
+
 	vid.support.ext_texture_3d = true;
 	//vid.support.ext_texture_compression_s3tc = true;
 	vid.support.ext_texture_filter_anisotropic = true;