Use default member initializers for simple types

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

diff --git a/source/core/texture1d.h b/source/core/texture1d.h
index 225cb0de2ec9f32e3f90fb2a74d818b546426090..04284697732784fc9ce9b84c1279d7bd40180665 100644 (file)
--- a/source/core/texture1d.h
+++ b/source/core/texture1d.h
@@ -1,13 +1,16 @@
 #ifndef MSP_GL_TEXTURE1D_H_
 #define MSP_GL_TEXTURE1D_H_
 
-#include "texture.h"
+#include <string>
+#include "texture1d_backend.h"
 
 namespace Msp {
 namespace GL {
 
-class Texture1D: public Texture
+class Texture1D: public Texture1DBackend
 {
+       friend Texture1DBackend;
+
 public:
        class Loader: public DataFile::DerivedObjectLoader<Texture1D, Texture::Loader>
        {
@@ -23,23 +26,14 @@ public:
        };
 
 private:
-       unsigned width;
-       unsigned levels;
-       unsigned allocated;
+       unsigned width = 0;
+       unsigned levels = 0;
 
 public:
-       Texture1D();
-
        void storage(PixelFormat, unsigned, unsigned = 0);
 
-       DEPRECATED void storage(PixelComponents c, unsigned w, unsigned l = 0)
-       { storage(make_pixelformat(c, UNSIGNED_BYTE), w, l); }
-
-       void allocate(unsigned);
        void image(unsigned, const void *);
-       DEPRECATED void image(unsigned, PixelComponents, DataType, const void *);
        void sub_image(unsigned, int, unsigned, const void *);
-       DEPRECATED void sub_image(unsigned, int, unsigned, PixelComponents, DataType, const void *);
        virtual void image(const Graphics::Image &, unsigned = 0);
        using Texture::image;
        unsigned get_width() const { return width; }