Always use RGBA color format when building Sequences

[libs/gl.git] / source / builders / sequencebuilder.cpp

diff --git a/source/builders/sequencebuilder.cpp b/source/builders/sequencebuilder.cpp
index dbb675acf2a7925a3ddf1e4b6b3969f04faaf8be..c80e2f09a07ad4c69164fdf63686017f692f2211 100644 (file)
--- a/source/builders/sequencebuilder.cpp
+++ b/source/builders/sequencebuilder.cpp
@@ -1,7 +1,7 @@
 #include <msp/core/algorithm.h>
 #include <msp/core/maputils.h>
 #include <msp/strings/format.h>
-#include "deviceinfo.h"
+#include "device.h"
 #include "error.h"
 #include "sequence.h"
 #include "sequencebuilder.h"
@@ -167,13 +167,12 @@ Sequence *SequenceBuilder::build(const Framebuffer &fbo) const
 
 FrameFormat SequenceBuilder::create_frame_format() const
 {
-       unsigned samples = min(tmpl.get_maximum_multisample(), DeviceInfo::get_global().limits.max_samples);
+       unsigned samples = min(tmpl.get_maximum_multisample(), Device::get_current().get_info().limits.max_samples);
        if(samples<tmpl.get_required_multisample())
                throw invalid_operation("SequenceBuilder::create_frame_format");
 
-       PixelComponents color_comp = (tmpl.get_alpha() ? RGBA : RGB);
        DataType color_type = (tmpl.get_hdr() ? HALF_FLOAT : UNSIGNED_BYTE);
-       PixelFormat color_pf = make_pixelformat(color_comp, color_type);
+       PixelFormat color_pf = make_pixelformat(RGBA, color_type);
 
        return (COLOR_ATTACHMENT,color_pf, DEPTH_ATTACHMENT).set_samples(samples);
 }