X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fframeformat.cpp;h=649693a43715a94b02974501148b21e4bc576592;hb=e70662d7812464159f2e47f4bebb69d88f89ae93;hp=36b45f6108d4e82f7ce2946d31b19d0c47932c5f;hpb=160e9eea29bd10034733d59507fa1bcca36be401;p=libs%2Fgl.git

diff --git a/source/core/frameformat.cpp b/source/core/frameformat.cpp
index 36b45f61..649693a4 100644
--- a/source/core/frameformat.cpp
+++ b/source/core/frameformat.cpp
@@ -1,18 +1,11 @@
-#include "deviceinfo.h"
 #include "error.h"
 #include "frameformat.h"
-#include "gl.h"
 
 using namespace std;
 
 namespace Msp {
 namespace GL {
 
-FrameFormat::FrameFormat():
-	count(0),
-	samples(1)
-{ }
-
 FrameFormat::FrameFormat(FrameAttachment fa):
 	count(1),
 	samples(1)
@@ -85,7 +78,9 @@ FrameAttachment make_typed_attachment(FrameAttachment fa, PixelFormat pf)
 	}
 	else
 	{
-		if(comp!=RED && comp!=RG && comp!=RGB && comp!=RGBA)
+		if(comp!=RED && comp!=RG && comp!=RGB && comp!=RGBA && comp!=BGR && comp!=BGRA)
+			throw invalid_argument("make_typed_attachment");
+		if(get_required_swizzle(comp))
 			throw invalid_argument("make_typed_attachment");
 	}