Add support for integer vertex attributes

[libs/gl.git] / source / core / texture.h

diff --git a/source/core/texture.h b/source/core/texture.h
index 7fb41a622b7b3c7609baea465480603d9b1555f5..e3697d2e712404940728085cce8b7ae0ea2818e5 100644 (file)
--- a/source/core/texture.h
+++ b/source/core/texture.h
@@ -86,10 +86,15 @@ protected:
        void set_parameter_i(GLenum, int) const;
 
 public:
+       PixelFormat get_format() const { return format; }
+
        static bool can_generate_mipmap();
 
        void generate_mipmap();
+protected:
+       void generate_mipmap_();
 
+public:
        /** Sets automatic mipmap generation.  If enabled, mipmaps are generated
        when a texture image is uploaded. */
        void set_auto_generate_mipmap(bool);
@@ -112,13 +117,6 @@ public:
        GLenum get_target() const { return target; }
        unsigned get_id() const { return id; }
 
-       void bind() const { bind_to(0); }
-       void bind_to(unsigned) const;
-
-       static const Texture *current(unsigned = 0);
-       static void unbind() { unbind_from(0); }
-       static void unbind_from(unsigned);
-
        virtual UInt64 get_data_size() const { return 0; }
 
        void set_debug_name(const std::string &);