Always update program uniforms if uniform names have changed

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

diff --git a/source/texturecube.h b/source/texturecube.h
index e775be1d31ec0ceb26d2fd47ee75597803caf969..fe343c7390630de1ad6fdc9a1f3a2cbc3ebfcdda 100644 (file)
--- a/source/texturecube.h
+++ b/source/texturecube.h
@@ -40,7 +40,10 @@ public:
        {
        public:
                Loader(TextureCube &);
+               Loader(TextureCube &, Collection &);
        private:
+               void init();
+
                void image_data(TextureCubeFace, const std::string &);
                void raw_data(TextureCubeFace, const std::string &);
                void storage(PixelFormat, unsigned);
@@ -77,7 +80,7 @@ public:
                int x, int y, unsigned w, unsigned h,
                PixelFormat fmt, DataType type, const void *data);
 
-       void image(TextureCubeFace, const Graphics::Image &);
+       void image(TextureCubeFace, const Graphics::Image &, bool = false);
 
        unsigned get_size() const { return size; }
 private:
@@ -99,6 +102,10 @@ public:
 
        /** Returns a vector pointing to the center a texel. */
        Vector3 get_texel_direction(TextureCubeFace, unsigned, unsigned);
+
+       virtual AsyncLoader *load(IO::Seekable &) { return 0; }
+       virtual UInt64 get_data_size() const;
+       virtual void unload() { }
 };
 
 void operator>>(const LexicalConverter &, TextureCubeFace &);