X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fframebuffer.h;h=e25967aca41ddfd6b29bfa6aae211e473e1807f2;hb=fe5bf090db687ef1dd1084218156bcbc0b801081;hp=cf64b45c37ef28cb88394d6ecca86c3c0f1fd8e4;hpb=e003d7a1497dad3b13e4e88e681f8fa2afc40c83;p=libs%2Fgl.git

diff --git a/source/framebuffer.h b/source/framebuffer.h
index cf64b45c..e25967ac 100644
--- a/source/framebuffer.h
+++ b/source/framebuffer.h
@@ -15,24 +15,24 @@ class Texture2D;
 
 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_UNSUPPORTED                   = GL_FRAMEBUFFER_UNSUPPORTED,
+	FRAMEBUFFER_COMPLETE                      = GL_FRAMEBUFFER_COMPLETE
 };
 
 enum BufferBits
@@ -57,6 +57,13 @@ enum RWBuffer
 	FRONT_AND_BACK = GL_FRONT_AND_BACK
 };
 
+class framebuffer_incomplete: public std::runtime_error
+{
+public:
+	framebuffer_incomplete(FramebufferStatus);
+	virtual ~framebuffer_incomplete() throw() { }
+};
+
 /**
 Framebuffer objects can be used to perform offscreen rendering.  The most
 common application is rendering to a texture, which can then be used for
@@ -107,6 +114,7 @@ public:
 private:
 	void update_attachment(unsigned) const;
 	void check_size();
+	unsigned get_attachment_index(FramebufferAttachment);
 public:
 	void attach(FramebufferAttachment attch, Renderbuffer &rbuf);
 	void attach(FramebufferAttachment attch, Texture2D &tex, unsigned level = 0);
@@ -118,6 +126,10 @@ 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 clear(BufferBits);
 
 	/** Blits a region from another framebuffer into this one.  If the source
@@ -141,8 +153,6 @@ public:
 	static void unbind();
 
 	static Framebuffer &system();
-private:
-	unsigned get_attachment_index(FramebufferAttachment);
 };
 
 inline BufferBits operator|(BufferBits a, BufferBits b)