summaryrefslogtreecommitdiffstats
path: root/src/plugins/imageformats
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@digia.com>2014-06-03 12:18:46 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-06-05 19:10:58 +0200
commit3b00497d50a022a359cce59696195dce43615b00 (patch)
tree9916119d915f31ff91cba8d591bc9b983a5d27be /src/plugins/imageformats
parentf4ecc48112c3084c8f031e2c036acf329ed5d780 (diff)
Fix multisampled fbo readback
Now that the current fbo is not tracked anymore, toImage() and blitFramebuffer() will not restore the previously bound (or whichever Qt thinks was current before) fbo. toImage() needs to accommodate this since the isBound() check was going wrong now that the blit always makes the fbo non-current. The current fbo is now queried via glGet both in toImage() and blitFramebuffer(). This will fix the recently introduced Lancelot failures with -glbuffer. Change-Id: I43a780beaeac4697d92cb0ebda7d14ca28a3924f Reviewed-by: aavit <eirik.aavitsland@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
Diffstat (limited to 'src/plugins/imageformats')
0 files changed, 0 insertions, 0 deletions