X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fframebuffer.cpp;h=8a1a52316f9fa6835e685570f6357d14955389d0;hb=f4f81f1d86d50b29b9a44b237f67c6f5ad8f0523;hp=167b403aec18e142548c9f02f775e453e71e6cb0;hpb=160e9eea29bd10034733d59507fa1bcca36be401;p=libs%2Fgl.git

diff --git a/source/core/framebuffer.cpp b/source/core/framebuffer.cpp
index 167b403a..8a1a5231 100644
--- a/source/core/framebuffer.cpp
+++ b/source/core/framebuffer.cpp
@@ -16,46 +16,28 @@ framebuffer_incomplete::framebuffer_incomplete(const std::string &reason):
 
 
 Framebuffer::Framebuffer(bool s):
-	FramebufferBackend(s),
-	dirty(0)
-{
-	if(s)
-	{
-		format = get_system_format();
-		get_system_size(width, height);
-	}
-}
+	FramebufferBackend(s)
+{ }
 
 Framebuffer::Framebuffer():
 	FramebufferBackend(false)
-{
-	init();
-}
+{ }
 
 Framebuffer::Framebuffer(FrameAttachment fa):
-	FramebufferBackend(false)
+	Framebuffer()
 {
-	init();
 	set_format(fa);
 }
 
 Framebuffer::Framebuffer(const FrameFormat &f):
-	FramebufferBackend(false)
+	Framebuffer()
 {
-	init();
 	set_format(f);
 }
 
-void Framebuffer::init()
-{
-	width = 0;
-	height = 0;
-	dirty = 0;
-}
-
 void Framebuffer::set_format(const FrameFormat &fmt)
 {
-	if(!format.empty() || !id)
+	if(!format.empty())
 		throw invalid_operation("Framebuffer::set_format");
 	if(fmt.empty() || !is_format_supported(fmt))
 		throw invalid_argument("Framebuffer::set_format");
@@ -115,7 +97,7 @@ void Framebuffer::check_size()
 
 void Framebuffer::set_attachment(FrameAttachment attch, Texture &tex, unsigned level, int layer, unsigned samples)
 {
-	if(format.empty() || !id)
+	if(format.empty() || attachments.empty())
 		throw invalid_operation("Framebuffer::attach");
 
 	if((format.get_samples()>1 && samples!=format.get_samples()) || (format.get_samples()==1 && samples))
@@ -171,7 +153,7 @@ void Framebuffer::attach_layered(FrameAttachment attch, TextureCube &tex, unsign
 
 void Framebuffer::detach(FrameAttachment attch)
 {
-	if(!id)
+	if(attachments.empty())
 		throw invalid_operation("Framebuffer::detach");
 
 	int i = format.index(attch);
@@ -183,20 +165,22 @@ void Framebuffer::detach(FrameAttachment attch)
 	}
 }
 
-void Framebuffer::resize(const WindowView &view)
+const Texture *Framebuffer::get_attachment(FrameAttachment attch) const
 {
-	if(id)
-		throw invalid_operation("Framebuffer::resize");
+	if(attachments.empty())
+		return 0;
 
-	width = view.get_width();
-	height = view.get_height();
+	int i = format.index(attch);
+	return (i>=0 ? attachments[i].tex : 0);
 }
 
-void Framebuffer::require_complete() const
+const Texture *Framebuffer::get_attachment(unsigned i) const
 {
-	if(!id)
-		return;
+	return (i<attachments.size() ? attachments[i].tex : 0);
+}
 
+void Framebuffer::require_complete() const
+{
 	bool layered = (!attachments.empty() && attachments.front().layer<0);
 	for(const Attachment &a: attachments)
 	{
@@ -209,18 +193,6 @@ void Framebuffer::require_complete() const
 	FramebufferBackend::require_complete();
 }
 
-Framebuffer &Framebuffer::system()
-{
-	static Framebuffer sys_framebuf(true);
-	return sys_framebuf;
-}
-
-
-Framebuffer::Attachment::Attachment():
-	tex(0),
-	level(0),
-	layer(0)
-{ }
 
 void Framebuffer::Attachment::set(Texture &t, unsigned l, int z)
 {