X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fframebuffer.h;h=f977ad7eb11fdc109740c7a19077ca1e3e7d7ec9;hp=8a97222c5ffac91a9c852119467130c7c8f5caad;hb=d713e5391dc5d85759c7aab36f6df7a85c3d8eff;hpb=06b79262c9d455669e93213200d959db5b221dc2

diff --git a/source/framebuffer.h b/source/framebuffer.h
index 8a97222c..f977ad7e 100644
--- a/source/framebuffer.h
+++ b/source/framebuffer.h
@@ -5,6 +5,10 @@
 #include "bindable.h"
 #include "gl.h"
 #include "texturecube.h"
+#include <msp/gl/extensions/arb_geometry_shader4.h>
+#include <msp/gl/extensions/ext_framebuffer_multisample.h>
+#include <msp/gl/extensions/ext_framebuffer_object.h>
+#include <msp/gl/extensions/nv_fbo_color_attachments.h>
 
 namespace Msp {
 namespace GL {
@@ -12,49 +16,45 @@ namespace GL {
 class Renderbuffer;
 class Texture;
 class Texture2D;
+class Texture3D;
 
 enum FramebufferAttachment
 {
-	COLOR_ATTACHMENT0  = GL_COLOR_ATTACHMENT0_EXT,
-	COLOR_ATTACHMENT1  = GL_COLOR_ATTACHMENT1_EXT,
-	COLOR_ATTACHMENT2  = GL_COLOR_ATTACHMENT2_EXT,
-	COLOR_ATTACHMENT3  = GL_COLOR_ATTACHMENT3_EXT,
-	DEPTH_ATTACHMENT   = GL_DEPTH_ATTACHMENT_EXT,
-	STENCIL_ATTACHMENT = GL_STENCIL_ATTACHMENT_EXT
+	COLOR_ATTACHMENT0  = GL_COLOR_ATTACHMENT0,
+	COLOR_ATTACHMENT1  = GL_COLOR_ATTACHMENT1,
+	COLOR_ATTACHMENT2  = GL_COLOR_ATTACHMENT2,
+	COLOR_ATTACHMENT3  = GL_COLOR_ATTACHMENT3,
+	DEPTH_ATTACHMENT   = GL_DEPTH_ATTACHMENT,
+	STENCIL_ATTACHMENT = GL_STENCIL_ATTACHMENT
 };
 
 enum FramebufferStatus
 {
-	FRAMEBUFFER_INCOMPLETE_ATTACHMENT         = GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT,
-	FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT = GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT,
+	FRAMEBUFFER_INCOMPLETE_ATTACHMENT         = GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT,
+	FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT = GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT,
 	FRAMEBUFFER_INCOMPLETE_DIMENSIONS         = GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT,
 	FRAMEBUFFER_INCOMPLETE_FORMATS            = GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT,
-	FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER        = GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT,
-	FRAMEBUFFER_INCOMPLETE_READ_BUFFER        = GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT,
-	FRAMEBUFFER_UNSUPPORTED                   = GL_FRAMEBUFFER_UNSUPPORTED_EXT,
-	FRAMEBUFFER_COMPLETE                      = GL_FRAMEBUFFER_COMPLETE_EXT
+	FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER        = GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER,
+	FRAMEBUFFER_INCOMPLETE_READ_BUFFER        = GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER,
+	FRAMEBUFFER_INCOMPLETE_MULTISAMPLE        = GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE,
+	FRAMEBUFFER_INCOMPLETE_LAYER_COUNT        = GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB,
+	FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS      = GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS,
+	FRAMEBUFFER_UNSUPPORTED                   = GL_FRAMEBUFFER_UNSUPPORTED,
+	FRAMEBUFFER_COMPLETE                      = GL_FRAMEBUFFER_COMPLETE
 };
 
 enum BufferBits
 {
 	COLOR_BUFFER_BIT   = GL_COLOR_BUFFER_BIT,
 	DEPTH_BUFFER_BIT   = GL_DEPTH_BUFFER_BIT,
-	STENCIL_BUFFER_BIT = GL_STENCIL_BUFFER_BIT,
-	ACCUM_BUFFER_BIT   = GL_ACCUM_BUFFER_BIT
+	STENCIL_BUFFER_BIT = GL_STENCIL_BUFFER_BIT
 };
 
-enum RWBuffer
+class framebuffer_incomplete: public std::runtime_error
 {
-	NO_BUFFER      = GL_NONE,
-	FRONT_LEFT     = GL_FRONT_LEFT,
-	FRONT_RIGHT    = GL_FRONT_RIGHT,
-	BACK_LEFT      = GL_BACK_LEFT,
-	BACK_RIGHT     = GL_BACK_RIGHT,
-	FRONT          = GL_FRONT,
-	BACK           = GL_BACK,
-	LEFT           = GL_LEFT,
-	RIGHT          = GL_RIGHT,
-	FRONT_AND_BACK = GL_FRONT_AND_BACK
+public:
+	framebuffer_incomplete(FramebufferStatus);
+	virtual ~framebuffer_incomplete() throw() { }
 };
 
 /**
@@ -82,18 +82,29 @@ private:
 			Texture *tex;
 		};
 		unsigned level;
-		GLenum cube_face;
+		unsigned layer;
 
 		Attachment(FramebufferAttachment);
 		void set(Renderbuffer &);
-		void set(Texture &, GLenum, unsigned);
+		void set(Texture &, unsigned, unsigned);
 		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 unsigned dirty;
 
 	Framebuffer(unsigned);
@@ -111,6 +122,7 @@ private:
 public:
 	void attach(FramebufferAttachment attch, Renderbuffer &rbuf);
 	void attach(FramebufferAttachment attch, Texture2D &tex, unsigned level = 0);
+	void attach(FramebufferAttachment attch, Texture3D &tex, unsigned layer, unsigned level = 0);
 	void attach(FramebufferAttachment attch, TextureCube &tex, TextureCubeFace face, unsigned level = 0);
 	void detach(FramebufferAttachment attch);
 
@@ -119,6 +131,13 @@ public:
 	or one of the error status codes otherwise. */
 	FramebufferStatus check_status() const;
 
+	/** 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(BufferBits);
 
 	/** Blits a region from another framebuffer into this one.  If the source