Convert svn:ignore to .gitignore

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

diff --git a/source/framebuffer.h b/source/framebuffer.h
index 514208d6db161fd3635f39538760bc6435160b94..70d32d7f1ab5e704a1e8685ddcba46970548f9e1 100644 (file)
--- a/source/framebuffer.h
+++ b/source/framebuffer.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007, 2009-2011  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -86,11 +86,11 @@ private:
                        Renderbuffer *rbuf;
                        Texture *tex;
                };
-               int level;
+               unsigned level;
 
                Attachment(FramebufferAttachment);
                void set(Renderbuffer &);
-               void set(Texture &, int);
+               void set(Texture &, unsigned);
                void clear();
        };
 
@@ -105,12 +105,15 @@ public:
        Framebuffer();
        ~Framebuffer();
 
+       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 detach(FramebufferAttachment attch);
 
        /**
@@ -121,6 +124,9 @@ 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;
 
@@ -130,9 +136,6 @@ public:
        static Framebuffer &system();
 private:
        unsigned get_attachment_index(FramebufferAttachment);
-
-public:
-       
 };
 
 inline BufferBits operator|(BufferBits a, BufferBits b)