Rewrite state management

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

diff --git a/source/core/texture3d.h b/source/core/texture3d.h
index 1f50e056d8cb286d8e99b4c739f83e5f09c777bd..2a8f653cd04422c333a1dcb81e937978dee38fda 100644 (file)
--- a/source/core/texture3d.h
+++ b/source/core/texture3d.h
@@ -2,6 +2,7 @@
 #define MSP_GL_TEXTURE3D_H_
 
 #include <string>
+#include <msp/linal/vector.h>
 #include "texture.h"
 
 namespace Msp {
@@ -27,14 +28,13 @@ public:
                void storage_levels(PixelFormat, unsigned, unsigned, unsigned, unsigned);
        };
 
-private:
+protected:
        unsigned width;
        unsigned height;
        unsigned depth;
        unsigned levels;
        unsigned allocated;
 
-protected:
        Texture3D(GLenum);
 public:
        Texture3D();
@@ -53,11 +53,19 @@ public:
        undefined.  If storage has already been allocated, does nothing. */
        void allocate(unsigned level);
 
+private:
+       void allocate_(unsigned);
+
+public:
        /** Updates the contents of the entire texture.  Storage must be defined
        beforehand.  The image data must have dimensions and format matching the
        defined storage. */
        void image(unsigned level, const void *data);
 
+private:
+       void image_(unsigned, const void *);
+
+public:
        DEPRECATED void image(unsigned level, PixelComponents comp, DataType type, const void *data);
 
        /** Updates a cuboid-shaped region of the texture.  Storage must be defined
@@ -83,7 +91,7 @@ public:
        unsigned get_depth() const { return depth; }
 protected:
        unsigned get_n_levels() const;
-       void get_level_size(unsigned, unsigned &, unsigned &, unsigned &) const;
+       LinAl::Vector<unsigned, 3> get_level_size(unsigned) const;
 
 public:
        virtual AsyncLoader *load(IO::Seekable &, const Resources * = 0) { return 0; }