Fix reflection of image types from Spir-V modules

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

diff --git a/source/core/texture1d.cpp b/source/core/texture1d.cpp
index 1015a0af9c4aae7c2906c8363eca1100e1d267cb..d6aa1a347c7e974b43397ab595d8de7b0edd3ef8 100644 (file)
--- a/source/core/texture1d.cpp
+++ b/source/core/texture1d.cpp
@@ -31,11 +31,11 @@ void Texture1D::image(unsigned level, const void *data)
        return sub_image(level, 0, get_level_size(level), data);
 }
 
-void Texture1D::sub_image(unsigned level, int x, unsigned wd, const void *data)
+void Texture1D::sub_image(unsigned level, unsigned x, unsigned wd, const void *data)
 {
        if(width==0)
                throw invalid_operation("Texture1D::sub_image");
-       if(level>=levels)
+       if(level>=levels || x>width || x+wd>width)
                throw out_of_range("Texture1D::sub_image");
 
        Texture1DBackend::sub_image(level, x, wd, data);
@@ -62,11 +62,6 @@ unsigned Texture1D::get_level_size(unsigned level) const
        return width>>level;
 }
 
-uint64_t Texture1D::get_data_size() const
-{
-       return id ? width*get_pixel_size(storage_fmt) : 0;
-}
-
 
 Texture1D::Loader::Loader(Texture1D &t):
        DataFile::DerivedObjectLoader<Texture1D, Texture::Loader>(t)
@@ -82,16 +77,10 @@ Texture1D::Loader::Loader(Texture1D &t, Collection &c):
 
 void Texture1D::Loader::init()
 {
-       add("raw_data", &Loader::raw_data);
        add("storage", &Loader::storage);
        add("storage", &Loader::storage_levels);
 }
 
-void Texture1D::Loader::raw_data(const string &data)
-{
-       obj.image(0, data.data());
-}
-
 void Texture1D::Loader::storage(PixelFormat fmt, unsigned w)
 {
        obj.storage(fmt, w);