Fix reflection of image types from Spir-V modules

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

diff --git a/source/core/texture2d.h b/source/core/texture2d.h
index 1c750bd1e87d301aed2f79799688e410ef1793bd..fbcee696686d0dbb93e067341badb2af2b809849 100644 (file)
--- a/source/core/texture2d.h
+++ b/source/core/texture2d.h
@@ -24,7 +24,6 @@ public:
        private:
                void init();
 
-               void raw_data(const std::string &);
                void storage(PixelFormat, unsigned, unsigned);
                void storage_levels(PixelFormat, unsigned, unsigned, unsigned);
        };
@@ -35,6 +34,8 @@ private:
        unsigned levels = 0;
 
 public:
+       Texture2D() = default;
+       Texture2D(Texture2D &&) = default;
        virtual ~Texture2D();
 
        /** Sets storage format and dimensions and allocates memory for the texture.
@@ -42,10 +43,7 @@ public:
        cannot be changed once set. */
        void storage(PixelFormat, unsigned wd, unsigned ht, unsigned lv = 0);
 
-       /** Replaces contents of an entire mipmap level.  Allocated storage must
-       exist.  The image data is interpreted according to the storage format and
-       must have size matching the selected mipmap level. */
-       virtual void image(unsigned level, const void *);
+       void image(unsigned level, const void *) override;
 
        /** Replaces a rectangular region of the texture.  Allocated storage must
        exist.  The image data is interpreted according to the storage format and
@@ -60,11 +58,6 @@ public:
 private:
        unsigned get_n_levels() const;
        LinAl::Vector<unsigned, 2> get_level_size(unsigned) const;
-
-public:
-       virtual Resource::AsyncLoader *load(IO::Seekable &, const Resources * = 0);
-       virtual std::size_t get_data_size() const;
-       using Texture2DBackend::unload;
 };
 
 } // namespace GL