X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fframebuffer.h;h=1dd8c96f219f946b42568e4c34d052df5d8c6a53;hp=07cae8671d22ef153b927e5fb2e64bdbb5c11d30;hb=18f611802019c809d4257f6d1c0e341d3a645b1a;hpb=57de40e1e802e44ae5b4caa67b0bb8763828b5c3

diff --git a/source/framebuffer.h b/source/framebuffer.h
index 07cae867..1dd8c96f 100644
--- a/source/framebuffer.h
+++ b/source/framebuffer.h
@@ -6,6 +6,7 @@
 #include "gl.h"
 #include "texturecube.h"
 #include <msp/gl/extensions/ext_framebuffer_object.h>
+#include <msp/gl/extensions/nv_fbo_color_attachments.h>
 
 namespace Msp {
 namespace GL {
@@ -13,6 +14,7 @@ namespace GL {
 class Renderbuffer;
 class Texture;
 class Texture2D;
+class Texture3D;
 
 enum FramebufferAttachment
 {
@@ -28,8 +30,8 @@ enum FramebufferStatus
 {
 	FRAMEBUFFER_INCOMPLETE_ATTACHMENT         = GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT,
 	FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT = GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT,
-	FRAMEBUFFER_INCOMPLETE_DIMENSIONS         = GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS,
-	FRAMEBUFFER_INCOMPLETE_FORMATS            = GL_FRAMEBUFFER_INCOMPLETE_FORMATS,
+	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,
 	FRAMEBUFFER_INCOMPLETE_READ_BUFFER        = GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER,
 	FRAMEBUFFER_UNSUPPORTED                   = GL_FRAMEBUFFER_UNSUPPORTED,
@@ -43,20 +45,6 @@ enum BufferBits
 	STENCIL_BUFFER_BIT = GL_STENCIL_BUFFER_BIT
 };
 
-enum RWBuffer
-{
-	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
-};
-
 class framebuffer_incomplete: public std::runtime_error
 {
 public:
@@ -89,11 +77,11 @@ 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();
 	};
 
@@ -129,6 +117,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);