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 04284697732784fc9ce9b84c1279d7bd40180665..abe6c8879e5dbd07469bc1319e2fc2e6ac91230a 100644 (file)
--- a/source/core/texture1d.h
+++ b/source/core/texture1d.h
@@ -7,6 +7,9 @@
 namespace Msp {
 namespace GL {
 
+/**
+One-dimensional texture, consisting of a single row of texels.
+*/
 class Texture1D: public Texture1DBackend
 {
        friend Texture1DBackend;
@@ -20,32 +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 = 0;
-       unsigned levels = 0;
 
 public:
-       void storage(PixelFormat, unsigned, unsigned = 0);
+       /** 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);
+
+       virtual void image(unsigned level, const void *);
+
+       /** 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 image(unsigned, const void *);
-       void sub_image(unsigned, int, unsigned, 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 std::uint64_t get_data_size() const;
-       virtual void unload() { }
 };
 
 } // namespace GL