Check the flat qualifier from the correct member

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

diff --git a/source/core/texturecube.h b/source/core/texturecube.h
index aa43c9da0a97ca084bd2690fd1f1e7b2dae35b13..127251d6497735b50267672807e8f4459b608988 100644 (file)
--- a/source/core/texturecube.h
+++ b/source/core/texturecube.h
@@ -49,7 +49,6 @@ public:
 
 private:
        unsigned size = 0;
-       unsigned levels = 0;
 
        static const Vector3 directions[6];
        static const unsigned orientations[12];
@@ -60,6 +59,8 @@ public:
        cannot be changed once set. */
        void storage(PixelFormat, unsigned size, unsigned lv = 0);
 
+       virtual void image(unsigned, const void *);
+
        /** Replaces contents of a single face.  Allocated storage must exist.  The
        image data is interpreted according to the storage format and must have size
        matching the selected mipmap level. */
@@ -68,7 +69,7 @@ public:
        /** Replaces a rectangular region of a face.  Allocated storage must exist.
        The image data is interpreted according to the storage format and the region
        must be fully inside the face. */
-       void sub_image(TextureCubeFace, unsigned level, int x, int y, unsigned w, unsigned h, const void *);
+       void sub_image(TextureCubeFace, unsigned level, unsigned x, unsigned y, unsigned w, unsigned h, const void *);
 
        void image(TextureCubeFace, const Graphics::Image &);
 
@@ -80,7 +81,6 @@ public:
 
        unsigned get_size() const { return size; }
 private:
-       unsigned get_n_levels() const;
        unsigned get_level_size(unsigned) const;
 
 public:
@@ -95,10 +95,6 @@ public:
 
        /** Returns a vector pointing to the center of a texel. */
        Vector3 get_texel_direction(TextureCubeFace, unsigned, unsigned);
-
-       virtual AsyncLoader *load(IO::Seekable &, const Resources * = 0) { return 0; }
-       virtual std::size_t get_data_size() const;
-       virtual void unload() { }
 };
 
 void operator>>(const LexicalConverter &, TextureCubeFace &);