Use constructor delegation instead of init functions when possible

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

diff --git a/source/core/texture.h b/source/core/texture.h
index 1631f69f248109a1a06764f9fd038b05841e685e..2f647b90cae721837f441a59c4c67e5c5f3f31fd 100644 (file)
--- a/source/core/texture.h
+++ b/source/core/texture.h
@@ -1,15 +1,11 @@
 #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"
+#include "texture_backend.h"
 
 namespace Msp {
 namespace GL {
@@ -23,8 +19,10 @@ A texture can consinst of a stack of images, called a mipmap.  The dimensions
 of each mipmap level are half that of the previous level.  The mipmap stack
 can be used for texture minification; see the Sampler class for details.
 */
-class Texture: public Resource
+class Texture: public TextureBackend, public Resource
 {
+       friend TextureBackend;
+
 protected:
        class Loader: public DataFile::CollectionObjectLoader<Texture>
        {
@@ -32,10 +30,12 @@ protected:
                unsigned levels;
 
        public:
-               Loader(Texture &);
-               Loader(Texture &, Collection &);
+               Loader(Texture &t): Loader(t, 0) { }
+               Loader(Texture &t, Collection &c): Loader(t, &c) { }
        private:
-               void init();
+               Loader(Texture &, Collection *);
+
+               virtual void finish();
 
        protected:
                void load_external_image(Graphics::Image &, const std::string &);
@@ -57,67 +57,32 @@ protected:
                RGB_TO_BGR
        };
 
-       unsigned id;
-       GLenum target;
        PixelFormat format;
        PixelFormat storage_fmt;
        FormatSwizzle swizzle;
        bool use_srgb_format;
        bool auto_gen_mipmap;
-       std::string debug_name;
 
-       static int swizzle_orders[];
-       static Texture *scratch_binding;
-
-       Texture(GLenum, ResourceManager * = 0);
-       Texture(const Texture &);
-       Texture &operator=(const Texture &);
-public:
-       ~Texture();
+       Texture(unsigned, ResourceManager * = 0);
 
-protected:
-       void generate_id();
        void set_format(PixelFormat);
-       void apply_swizzle();
-       void set_parameter_i(GLenum, int) const;
 
 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); }
+       using TextureBackend::generate_mipmap;
 
        /// 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 &);
-
-protected:
-       void bind_scratch();
-public:
-       static void unbind_scratch();
+       using TextureBackend::set_debug_name;
 };
 
 } // namespace GL