X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fframebuffer.h;h=9b0360fb9354a19e428b98b7fc652b3c8d0ed951;hb=4fe225bf15048fcb7a678370f87d09f2de37031a;hp=3bf439f98cc62ca3250369abe61cdaf6c5c9de9c;hpb=80977251da90a6878b82d143c22b8335284d3b3e;p=libs%2Fgl.git

diff --git a/source/framebuffer.h b/source/framebuffer.h
index 3bf439f9..9b0360fb 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/msp_stereo_rendering.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_EXT,
-	FRAMEBUFFER_INCOMPLETE_FORMATS            = GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT,
+	FRAMEBUFFER_INCOMPLETE_DIMENSIONS         = GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS,
+	FRAMEBUFFER_INCOMPLETE_FORMATS            = GL_FRAMEBUFFER_INCOMPLETE_FORMATS,
 	FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER        = GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER,
 	FRAMEBUFFER_INCOMPLETE_READ_BUFFER        = GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER,
 	FRAMEBUFFER_UNSUPPORTED                   = GL_FRAMEBUFFER_UNSUPPORTED,
@@ -40,8 +42,7 @@ 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
@@ -90,18 +91,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);
@@ -119,6 +131,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);
 
@@ -131,6 +144,9 @@ public:
 	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