X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fframebuffer.h;h=9fe59bf774b929474869cb2f5ba60b3970ba6804;hp=3086685e1ce29234e8f1e8629bb7ffd103f7050f;hb=cd5f37b066352119cf92d53d0001af7ff99be437;hpb=ccd636b2fa8b9f270fbe600629dd109e78d00992

diff --git a/source/core/framebuffer.h b/source/core/framebuffer.h
index 3086685e..9fe59bf7 100644
--- a/source/core/framebuffer.h
+++ b/source/core/framebuffer.h
@@ -2,7 +2,6 @@
 #define MSP_GL_FRAMEBUFFER_H_
 
 #include <vector>
-#include "bindable.h"
 #include "gl.h"
 #include "texturecube.h"
 #include <msp/gl/extensions/arb_geometry_shader4.h>
@@ -13,10 +12,11 @@
 namespace Msp {
 namespace GL {
 
-class Renderbuffer;
 class Texture;
 class Texture2D;
+class Texture2DMultisample;
 class Texture3D;
+class WindowView;
 
 enum FramebufferAttachment
 {
@@ -63,48 +63,32 @@ common application is rendering to a texture, which can then be used for
 fullscreen shader effects.
 
 A framebuffer consist of a number of logical buffers, such as color and depth
-buffers.  Renderbuffers and Textures can be attached to the logical buffers.  At
-least one image must be attached for the framebuffer to be usable.
+buffers.  Textures can be attached to the logical buffers.  At least one image
+must be attached for the framebuffer to be usable.
 
 Requires the GL_EXT_framebuffer_object extension.  The blit functions require
 the GL_EXT_framebuffer_blit extension.
 */
-class Framebuffer: public Bindable<Framebuffer>
+class Framebuffer
 {
 private:
 	struct Attachment
 	{
 		FramebufferAttachment attachment;
-		GLenum type;
-		union
-		{
-			Renderbuffer *rbuf;
-			Texture *tex;
-		};
+		Texture *tex;
 		unsigned level;
-		unsigned layer;
+		int layer;
 
 		Attachment(FramebufferAttachment);
-		void set(Renderbuffer &);
-		void set(Texture &, unsigned, unsigned);
+		void set(Texture &, unsigned, int);
 		void clear();
 	};
 
-	struct Viewport
-	{
-		int left;
-		int bottom;
-		unsigned width;
-		unsigned height;
-
-		Viewport();
-	};
-
 	unsigned id;
 	std::vector<Attachment> attachments;
 	unsigned width;
 	unsigned height;
-	Viewport view;
+	mutable FramebufferStatus status;
 	mutable unsigned dirty;
 
 	Framebuffer(unsigned);
@@ -116,51 +100,34 @@ public:
 	unsigned get_height() const { return height; }
 
 private:
-	void update_attachment(unsigned) const;
+	void update() const;
 	void check_size();
 	unsigned get_attachment_index(FramebufferAttachment);
-	void set_texture_attachment(FramebufferAttachment, Texture &, unsigned, int);
+	void set_attachment(FramebufferAttachment, Texture &, unsigned, int);
 public:
-	void attach(FramebufferAttachment attch, Renderbuffer &rbuf);
 	void attach(FramebufferAttachment attch, Texture2D &tex, unsigned level = 0);
+	void attach(FramebufferAttachment attch, Texture2DMultisample &tex);
 	void attach(FramebufferAttachment attch, Texture3D &tex, unsigned layer, unsigned level = 0);
 	void attach(FramebufferAttachment attch, TextureCube &tex, TextureCubeFace face, unsigned level = 0);
+	void attach_layered(FramebufferAttachment attch, Texture3D &tex, unsigned level = 0);
+	void attach_layered(FramebufferAttachment attch, TextureCube &tex, unsigned level = 0);
 	void detach(FramebufferAttachment attch);
 
-	/** Checks the completeness of the framebuffer.  Returns
-	FRAMEBUFFER_COMPLETE if the framebuffer is complete and can be rendered to,
-	or one of the error status codes otherwise. */
-	FramebufferStatus check_status() const;
+	void resize(const WindowView &);
+
+	/** Returns FRAMEBUFFER_COMPLETE if the framebuffer is complete and can be
+	rendered to, or one of the error status codes otherwise. */
+	FramebufferStatus get_status() const { return status; }
 
 	/** Ensures that the framebuffer is complete, throwing an exception if it
 	isn't. */
 	void require_complete() const;
 
-	void viewport(int, int, unsigned, unsigned);
-	void reset_viewport();
-
-	void clear();
-	void clear(BufferBits);
-
-	/** Blits a region from another framebuffer into this one.  If the source
-	and destination regions have different dimensions, the contents will be
-	stretched.  If filter is true, linear interpolation will be used, otherwise
-	no interpolation is done. */
-	void blit_from(const Framebuffer &other, int sx0, int sy0, int sx1, int sy1,
-		int dx0, int dy0, int dx1, int dy1, BufferBits bits, bool filter);
-
-	/** Blits a region from another framebuffer into this one, retaining its
-	dimensions. */
-	void blit_from(const Framebuffer & other, int sx, int sy,
-		unsigned wd, unsigned ht, int dx, int dy, BufferBits bits);
-
-	/** Blits the entire contents of another framebuffer into this one. */
-	void blit_from(const Framebuffer &other, BufferBits bits, bool filter);
+	void refresh() const { if(dirty) update(); }
 
-	void bind() const;
+	unsigned get_id() const { return id; }
 
-	static const Framebuffer *current();
-	static void unbind();
+	void set_debug_name(const std::string &);
 
 	static Framebuffer &system();
 };