Require texture data to be uploaded in a format matching the storage

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

diff --git a/source/texture.h b/source/texture.h
index 6c0fbf2574b6cb6f8a897e62f0977b8db9486e4f..30c6496a5658525e00a6ac59374996c25f08d7e3 100644 (file)
--- a/source/texture.h
+++ b/source/texture.h
@@ -70,7 +70,8 @@ protected:
 
        unsigned id;
        GLenum target;
-       PixelFormat ifmt;
+       PixelFormat format;
+       PixelFormat storage_fmt;
        FormatSwizzle swizzle;
        bool auto_gen_mipmap;
        Sampler default_sampler;
@@ -84,8 +85,7 @@ public:
        ~Texture();
 
 protected:
-       void set_internal_format(PixelFormat);
-       PixelComponents get_upload_components(PixelComponents) const;
+       void set_format(PixelFormat);
        void apply_swizzle();
        void set_parameter_i(GLenum, int) const;