Add methods to get Framebuffer size

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

diff --git a/source/texture2d.h b/source/texture2d.h
index 012718528af72592039831c2a27c69b6a58aa728..8508b0435847eaa7eaf9485c5b0765017e4dbe6f 100644 (file)
--- a/source/texture2d.h
+++ b/source/texture2d.h
@@ -30,14 +30,15 @@ public:
        private:
                void image_data(const std::string &);
                void raw_data(const std::string &);
        private:
                void image_data(const std::string &);
                void raw_data(const std::string &);

-               void storage(PixelFormat, unsigned, unsigned, unsigned);
+               void storage(PixelFormat, unsigned, unsigned);
+               void storage_b(PixelFormat, unsigned, unsigned, unsigned);

        };
 
 private:
        PixelFormat ifmt;
        unsigned width;
        unsigned height;
        };
 
 private:
        PixelFormat ifmt;
        unsigned width;
        unsigned height;

-       int border;
+       unsigned allocated;

 
 public:
        Texture2D();
 
 public:
        Texture2D();


@@ -46,20 +47,22 @@ public:
        Defines the texture storage.  This function may only be successfully called
        once.
        */
        Defines the texture storage.  This function may only be successfully called
        once.
        */

-       void storage(PixelFormat fmt, unsigned wd, unsigned ht, int brd);
+       void storage(PixelFormat fmt, unsigned wd, unsigned ht);
+
+       /** Allocates texture storage.  If storage has already been allocated, this
+       function does nothing. */
+       void allocate(unsigned level);

        
        

-       /**
-       Uploads an image to the texture.  storage() must have been called prior to
+       /** Uploads an image to the texture.  storage() must have been called prior to

        this, and the image must have dimensions conforming to the specified
        this, and the image must have dimensions conforming to the specified

-       storage.
-       */
-       void image(int level, PixelFormat fmt, DataType type, const void *data);
+       storage.  For level>0, mipmapping rules apply to the image dimensions. */
+       void image(unsigned level, PixelFormat fmt, DataType type, const void *data);

 
        /**
        Uploads a sub-image into the texture.  Unlike full image upload, there are
        no constraints on the size of the sub-image.
        */
 
        /**
        Uploads a sub-image into the texture.  Unlike full image upload, there are
        no constraints on the size of the sub-image.
        */

-       void sub_image(int level, int x, int y, unsigned wd, unsigned ht, PixelFormat fmt, DataType type, const void *data);
+       void sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, PixelFormat fmt, DataType type, const void *data);

 
        /**
        Loads an image from a file and uploads it to the texture.  If storage() has
 
        /**
        Loads an image from a file and uploads it to the texture.  If storage() has


@@ -72,6 +75,8 @@ public:
 
 private:
        void image(const Graphics::Image &);
 
 private:
        void image(const Graphics::Image &);

+       void require_storage();
+       void get_level_size(unsigned, unsigned &, unsigned &);

 };
 
 } // namespace GL
 };
 
 } // namespace GL