X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fframebuffer.h;h=ea462bf6ad432bd78da37afef4fa77103bc676ff;hb=ccbcce1d5c7fae8ec644e465ac936f5c39000e57;hp=9fe4cd8bd028f1d929ead4111ddcd8f11126d619;hpb=98c810b6d2256aa65986bbde12c38917678121bb;p=libs%2Fgl.git

diff --git a/source/framebuffer.h b/source/framebuffer.h
index 9fe4cd8b..ea462bf6 100644
--- a/source/framebuffer.h
+++ b/source/framebuffer.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007, 2009-2011  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -9,8 +9,8 @@ Distributed under the LGPL
 #define MSP_GL_FRAMEBUFFER_H_
 
 #include <vector>
+#include "bindable.h"
 #include "gl.h"
-#include "types.h"
 
 namespace Msp {
 namespace GL {
@@ -74,7 +74,7 @@ least one image must be attached for the framebuffer to be usable.
 
 Requires the GL_EXT_framebuffer_object extension.
 */
-class Framebuffer
+class Framebuffer: public Bindable<Framebuffer>
 {
 private:
 	struct Attachment
@@ -86,28 +86,31 @@ private:
 			Renderbuffer *rbuf;
 			Texture *tex;
 		};
+		unsigned level;
 
 		Attachment(FramebufferAttachment);
-		Attachment &operator=(Renderbuffer &);
-		Attachment &operator=(Texture &);
+		void set(Renderbuffer &);
+		void set(Texture &, unsigned);
+		void clear();
 	};
 
-	uint id;
+	unsigned id;
 	std::vector<Attachment> attachments;
 	unsigned width;
 	unsigned height;
+	mutable unsigned dirty;
 
-	static const Framebuffer *cur_fbo;
-	static int sys_viewport[4];
-
+	Framebuffer(unsigned);
 public:
 	Framebuffer();
 	~Framebuffer();
 
-	void bind() const;
-
+private:
+	void update_attachment(unsigned) const;
+	void check_size();
+public:
 	void attach(FramebufferAttachment attch, Renderbuffer &rbuf);
-	void attach(FramebufferAttachment attch, Texture2D &tex, int level);
+	void attach(FramebufferAttachment attch, Texture2D &tex, unsigned level = 0);
 	void detach(FramebufferAttachment attch);
 
 	/**
@@ -117,22 +120,24 @@ public:
 	*/
 	FramebufferStatus check_status() const;
 
+	void clear(BufferBits);
+	void blit_from(const Framebuffer &, int, int, int, int, int, int, int, int, BufferBits, bool);
+	void blit_from(const Framebuffer &, int, int, unsigned, unsigned, int, int, BufferBits);
+	void blit_from(const Framebuffer &, BufferBits, bool);
+
+	void bind() const;
+
 	static const Framebuffer *current();
 	static void unbind();
+
+	static Framebuffer &system();
 private:
-	void maybe_bind() const;
-	Attachment &get_or_create_attachment(FramebufferAttachment);
-	void check_size();
+	unsigned get_attachment_index(FramebufferAttachment);
 };
 
 inline BufferBits operator|(BufferBits a, BufferBits b)
 { return static_cast<BufferBits>(static_cast<int>(a)|static_cast<int>(b)); }
 
-void viewport(int, int, unsigned, unsigned);
-void clear(BufferBits);
-void draw_buffer(RWBuffer);
-void read_buffer(RWBuffer);
-
 } // namespace GL
 } // namespace Msp