Fix 3D texture loading with fixed depth

[libs/gl.git] / source / framebuffer.h

diff --git a/source/framebuffer.h b/source/framebuffer.h
index b4f43f77f47473a12381eb499eb13a3c6d658c13..e33deda9218d9bf3afea690b44fc1e9dd6329bc1 100644 (file)
--- a/source/framebuffer.h
+++ b/source/framebuffer.h
@@ -1,16 +1,10 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_FRAMEBUFFER_H_
 #define MSP_GL_FRAMEBUFFER_H_
 
 #include <vector>
 #include "bindable.h"
 #include "gl.h"
+#include "texturecube.h"
 
 namespace Msp {
 namespace GL {
@@ -86,27 +80,36 @@ private:
                        Renderbuffer *rbuf;
                        Texture *tex;
                };
+               unsigned level;
+               GLenum cube_face;
 
                Attachment(FramebufferAttachment);
-               Attachment &operator=(Renderbuffer &);
-               Attachment &operator=(Texture &);
+               void set(Renderbuffer &);
+               void set(Texture &, GLenum, unsigned);
+               void clear();
        };
 
        unsigned id;
        std::vector<Attachment> attachments;
        unsigned width;
        unsigned height;
+       mutable unsigned dirty;
 
-       static int sys_viewport[4];
-
+       Framebuffer(unsigned);
 public:
        Framebuffer();
        ~Framebuffer();
 
-       void bind() const;
+       unsigned get_width() const { return width; }
+       unsigned get_height() const { return height; }
 
+private:
+       void update_attachment(unsigned) const;
+       void check_size();
+public:
        void attach(FramebufferAttachment attch, Renderbuffer &rbuf);
-       void attach(FramebufferAttachment attch, Texture2D &tex, int level);
+       void attach(FramebufferAttachment attch, Texture2D &tex, unsigned level = 0);
+       void attach(FramebufferAttachment attch, TextureCube &tex, TextureCubeFace face, unsigned level = 0);
        void detach(FramebufferAttachment attch);
 
        /**
@@ -116,21 +119,24 @@ public:
        */
        FramebufferStatus check_status() const;
 
+       void clear(BufferBits);
+       void blit_from(const Framebuffer &, int, int, int, int, int, int, int, int, BufferBits, bool);
+       void blit_from(const Framebuffer &, int, int, unsigned, unsigned, int, int, BufferBits);
+       void blit_from(const Framebuffer &, BufferBits, bool);
+
+       void bind() const;
+
+       static const Framebuffer *current();
        static void unbind();
+
+       static Framebuffer &system();
 private:
-       void maybe_bind() const;
-       Attachment &get_or_create_attachment(FramebufferAttachment);
-       void check_size();
+       unsigned get_attachment_index(FramebufferAttachment);
 };
 
 inline BufferBits operator|(BufferBits a, BufferBits b)
 { return static_cast<BufferBits>(static_cast<int>(a)|static_cast<int>(b)); }
 
-void viewport(int, int, unsigned, unsigned);
-void clear(BufferBits);
-void draw_buffer(RWBuffer);
-void read_buffer(RWBuffer);
-
 } // namespace GL
 } // namespace Msp