Remove remaining deprecated things from the core classes

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

diff --git a/source/core/texture.h b/source/core/texture.h
index 1631f69f248109a1a06764f9fd038b05841e685e..80012f46846a7bd11746ed182fc2a56a21c8dfc5 100644 (file)
--- a/source/core/texture.h
+++ b/source/core/texture.h
@@ -1,14 +1,10 @@
 #ifndef MSP_GL_TEXTURE_H_
 #define MSP_GL_TEXTURE_H_
 
-#include <msp/core/attributes.h>
 #include <msp/datafile/objectloader.h>
 #include <msp/graphics/image.h>
-#include "datatype.h"
 #include "gl.h"
 #include "pixelformat.h"
-#include "predicate.h"
-#include "sampler.h"
 #include "resource.h"
 
 namespace Msp {
@@ -37,6 +33,8 @@ protected:
        private:
                void init();
 
+               virtual void finish();
+
        protected:
                void load_external_image(Graphics::Image &, const std::string &);
 
@@ -84,33 +82,20 @@ protected:
 public:
        PixelFormat get_format() const { return format; }
 
-       static bool can_generate_mipmap();
-
        void generate_mipmap();
 
-       /** Sets automatic mipmap generation.  If enabled, mipmaps are generated
-       when a texture image is uploaded. */
-       void set_auto_generate_mipmap(bool);
-
-       /// Deprecated.  Use set_auto_generate_mipmap instead.
-       DEPRECATED void set_generate_mipmap(bool g) { set_auto_generate_mipmap(g); }
-
        /// Loads a Graphics::Image from a file and uploads it to the texture.
        virtual void load_image(const std::string &, unsigned = 0);
 
-       DEPRECATED void load_image(const std::string &, bool srgb);
-
        /** Uploads an image to the texture.  If storage has not been defined, it
        will be set to match the image.  Otherwise the image must be compatible
        with the defined storage.  Semantics depend on the type of texture.  */
        virtual void image(const Graphics::Image &, unsigned = 0) = 0;
 
-       DEPRECATED void image(const Graphics::Image &, bool srgb);
-
        GLenum get_target() const { return target; }
        unsigned get_id() const { return id; }
 
-       virtual UInt64 get_data_size() const { return 0; }
+       virtual std::uint64_t get_data_size() const { return 0; }
 
        void set_debug_name(const std::string &);