Check the flat qualifier from the correct member

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

diff --git a/source/core/texture1d.h b/source/core/texture1d.h
index b14ff917666f88cb02fc7fbbcd5c55a8330b0075..abe6c8879e5dbd07469bc1319e2fc2e6ac91230a 100644 (file)
--- a/source/core/texture1d.h
+++ b/source/core/texture1d.h
@@ -1,13 +1,19 @@
 #ifndef MSP_GL_TEXTURE1D_H_
 #define MSP_GL_TEXTURE1D_H_
 
-#include "texture.h"
+#include <string>
+#include "texture1d_backend.h"
 
 namespace Msp {
 namespace GL {
 
-class Texture1D: public Texture
+/**
+One-dimensional texture, consisting of a single row of texels.
+*/
+class Texture1D: public Texture1DBackend
 {
+       friend Texture1DBackend;
+
 public:
        class Loader: public DataFile::DerivedObjectLoader<Texture1D, Texture::Loader>
        {
@@ -17,41 +23,32 @@ public:
        private:
                void init();
 
-               void raw_data(const std::string &);
                void storage(PixelFormat, unsigned);
                void storage_levels(PixelFormat, unsigned, unsigned);
        };
 
 private:
-       unsigned width;
-       unsigned levels;
-       unsigned allocated;
+       unsigned width = 0;
 
 public:
-       Texture1D();
+       /** Sets storage format and size and allocates memory for the texture.  If
+       lv is zero, a complete mipmap pyramid is automatically created.  Storage
+       cannot be changed once set. */
+       void storage(PixelFormat, unsigned wd, unsigned lv = 0);
 
-       void storage(PixelFormat, unsigned, unsigned = 0);
+       virtual void image(unsigned level, const void *);
 
-       DEPRECATED void storage(PixelComponents c, unsigned w, unsigned l = 0)
-       { storage(make_pixelformat(c, UNSIGNED_BYTE), w, l); }
+       /** Replaces a range of texels in the texture.  Allocated storage must
+       exist.  The image data is interpreted according to the storage format and
+       the range must be fully inside the selected mipmap level. */
+       void sub_image(unsigned level, unsigned x, unsigned wd, const void *);
 
-       void allocate(unsigned);
-       void image(unsigned, const void *);
-       DEPRECATED void image(unsigned, PixelComponents, DataType, const void *);
-       void sub_image(unsigned, int, unsigned, const void *);
-       DEPRECATED void sub_image(unsigned, int, unsigned, PixelComponents, DataType, const void *);
        virtual void image(const Graphics::Image &, unsigned = 0);
-       using Texture::image;
+
        unsigned get_width() const { return width; }
 
 private:
-       unsigned get_n_levels() const;
        unsigned get_level_size(unsigned) const;
-
-public:
-       virtual AsyncLoader *load(IO::Seekable &, const Resources * = 0) { return 0; }
-       virtual UInt64 get_data_size() const;
-       virtual void unload() { }
 };
 
 } // namespace GL