]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
for now, turn off FBO if multisampling as their combination is not implemented yet
authordivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Sun, 16 Oct 2011 12:39:10 +0000 (12:39 +0000)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 18 Oct 2011 13:05:13 +0000 (15:05 +0200)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11428 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=4dfe3710c36945df2d7de419207f05b6aa6a7ac4

vid_shared.c

index 925ef592494819de82f027b27dd5898afe39d155..1e1d4ae107876783450c300ad8d2b65a7d2f91c8 100644 (file)
@@ -1126,7 +1126,15 @@ void VID_CheckExtensions(void)
                int samples = 0;
                qglGetIntegerv(GL_SAMPLES_ARB, &samples);
                if (samples > 1)
+               {
                        qglEnable(GL_MULTISAMPLE_ARB);
+
+                       // currently, multisampling is not supported by our FBO paths
+                       // so for now, disable FBOs if multisample is requested
+                       // FIXME instead, support FBOs + multisampling, and turn off
+                       // multisampling on chipsets that don't support this combination
+                       vid.support.ext_framebuffer_object = false;
+               }
                else
                        vid.allowalphatocoverage = false;
        }