Use default member initializers for simple types

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

diff --git a/source/core/vertexsetup.h b/source/core/vertexsetup.h
index 756f5bc03644990990aafb1f360c1cebb9b6bfe0..208e55d3cd676729d4299024feaad06a273bf3d2 100644 (file)
--- a/source/core/vertexsetup.h
+++ b/source/core/vertexsetup.h
@@ -3,6 +3,7 @@
 
 #include "datatype.h"
 #include "vertexformat.h"
+#include "vertexsetup_backend.h"
 
 namespace Msp {
 namespace GL {
@@ -14,8 +15,10 @@ class VertexArray;
 Combines a VertexArray with an index buffer.  This wraps OpenGL's vertex array
 objects.  Intended for internal use.
 */
-class VertexSetup
+class VertexSetup: public VertexSetupBackend
 {
+       friend VertexSetupBackend;
+
 private:
        enum ComponentMask
        {
@@ -24,19 +27,15 @@ private:
                INDEX_BUFFER = 4
        };
 
-       unsigned id;
-       mutable unsigned dirty;
-       const VertexArray *vertex_array;
+       mutable unsigned dirty = 0;
+       const VertexArray *vertex_array = 0;
        VertexFormat vertex_format;
-       const VertexArray *inst_array;
+       const VertexArray *inst_array = 0;
        VertexFormat inst_format;
-       const Buffer *index_buffer;
-       DataType index_type;
+       const Buffer *index_buffer = 0;
+       DataType index_type = UNSIGNED_SHORT;
 
 public:
-       VertexSetup();
-       ~VertexSetup();
-
        void set_format(const VertexFormat &);
        void set_format_instanced(const VertexFormat &, const VertexFormat &);
 
@@ -51,16 +50,13 @@ public:
 private:
        static bool verify_format(const VertexFormat &);
        void update() const;
-       void update_vertex_array(const VertexArray &, unsigned, unsigned, bool) const;
 
 public:
        void refresh() const { if(dirty) update(); }
 
-       unsigned get_id() const { return id; }
-
        void unload();
 
-       void set_debug_name(const std::string &);
+       using VertexSetupBackend::set_debug_name;
 };
 
 } // namespace GL