Use size_t to store sizes of buffers and such

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

diff --git a/source/core/texture.h b/source/core/texture.h
index 04a810856a5dedab8b16ecbbd453f6817fddd1d7..c593c0ad5236657ac4f08b45ded75f8c3a144f4b 100644 (file)
--- a/source/core/texture.h
+++ b/source/core/texture.h
@@ -1,15 +1,12 @@
 #ifndef MSP_GL_TEXTURE_H_
 #define MSP_GL_TEXTURE_H_
 
-#include <msp/core/attributes.h>
+#include <msp/datafile/dynamicobjectloader.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 +20,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 +31,10 @@ 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();
 
@@ -51,6 +50,19 @@ protected:
                void mipmap_levels(unsigned);
        };
 
+public:
+       class GenericLoader: public DataFile::DynamicObjectLoader<Texture>
+       {
+               friend class Texture;
+
+       public:
+               GenericLoader(Collection &c): DynamicObjectLoader<Texture>(&c) { }
+
+       protected:
+               virtual const TypeRegistry &get_type_registry() const { return get_texture_registry(); }
+       };
+
+protected:
        enum FormatSwizzle
        {
                NO_SWIZZLE,
@@ -59,58 +71,35 @@ 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);
 
-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; }
 
-       void generate_mipmap();
+       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);
+       virtual std::size_t get_data_size() const { return 0; }
 
-       GLenum get_target() const { return target; }
-       unsigned get_id() const { return id; }
+       using TextureBackend::set_debug_name;
 
-       virtual UInt64 get_data_size() const { return 0; }
-
-       void set_debug_name(const std::string &);
-
-protected:
-       void bind_scratch();
-public:
-       static void unbind_scratch();
+private:
+       static GenericLoader::TypeRegistry &get_texture_registry();
 };
 
 } // namespace GL