From 22beaad50db64073a38061859164cda2fdece9cf Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 21 Dec 2009 19:01:03 +0000 Subject: [PATCH] Apply Schell Games change to GLX case as well --- panda/src/glxdisplay/glxGraphicsPipe.cxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/panda/src/glxdisplay/glxGraphicsPipe.cxx b/panda/src/glxdisplay/glxGraphicsPipe.cxx index 8f78161336..9b4ab9351d 100644 --- a/panda/src/glxdisplay/glxGraphicsPipe.cxx +++ b/panda/src/glxdisplay/glxGraphicsPipe.cxx @@ -126,11 +126,15 @@ make_output(const string &name, } // Early failure - if we are sure that this buffer WONT // meet specs, we can bail out early. + int _fbo_multisample = 0; + if (!ConfigVariableBool("framebuffer-object-multisample", false, PRC_DESC("Enabled Multisample."))) { + _fbo_multisample = 16; + } if ((flags & BF_fb_props_optional)==0) { if ((fb_prop.get_indexed_color() > 0)|| (fb_prop.get_back_buffers() > 0)|| (fb_prop.get_accum_bits() > 0)|| - (fb_prop.get_multisamples() > 0)) { + (fb_prop.get_multisamples() > _fbo_multisample)) { return NULL; } }