Support specifying elements in PrimitiveBuilder

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

diff --git a/source/texture2d.h b/source/texture2d.h
index b62466cb0a75bc524cf11a484567bfe17eb02625..13073a2d74ea98cade27a9212229a365137e7175 100644 (file)
--- a/source/texture2d.h
+++ b/source/texture2d.h
@@ -30,6 +30,8 @@ public:
                Loader(Texture2D &);
        private:
                void image_data(const std::string &);
+               void raw_data(const std::string &);
+               void storage(PixelFormat, unsigned, unsigned, unsigned);
        };
 
 private:
@@ -52,13 +54,13 @@ public:
        this, and the image must have dimensions conforming to the specified
        storage.
        */
-       void image(int level, PixelFormat fmt, GLenum type, const void *data);
+       void image(int 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.
        */
-       void sub_image(int level, int x, int y, sizei wd, sizei ht, PixelFormat fmt, GLenum type, const void *data);
+       void sub_image(int level, int x, int y, sizei wd, sizei ht, PixelFormat fmt, DataType type, const void *data);
 
        /**
        Loads an image from a file and uploads it to the texture.  If storage() has