Use default member initializers in some more classes

[libs/gl.git] / source / render / renderer.h

diff --git a/source/render/renderer.h b/source/render/renderer.h
index af9eac0426e4c265a76bd2dc54879a5f85b636c3..0496aaf3f68584496b5f13bf754338e6c5d91ec3 100644 (file)
--- a/source/render/renderer.h
+++ b/source/render/renderer.h
@@ -16,7 +16,6 @@ class Batch;
 class Buffer;
 class Camera;
 union ClearValue;
-class Clipping;
 class Material;
 class Mesh;
 class Lighting;
@@ -69,42 +68,37 @@ private:
        struct BoundTexture
        {
                Tag tag;
-               mutable int unit;
-               const Texture *texture;
-               const Sampler *sampler;
-               int replaced;
-
-               BoundTexture();
+               mutable int unit = -1;
+               const Texture *texture = 0;
+               const Sampler *sampler = 0;
+               int replaced = -1;
        };
 
        struct BoundProgramData
        {
                const ProgramData *shdata;
-               mutable unsigned generation;
+               mutable unsigned generation = 0;
 
                BoundProgramData(const ProgramData *);
        };
 
        struct State
        {
-               const Camera *camera;
+               const Camera *camera = 0;
                Matrix model_matrix;
-               const Framebuffer *framebuffer;
-               const Rect *viewport;
-               const Rect *scissor;
-               unsigned texture_count;
-               const Clipping *clipping;
-               const Program *shprog;
-               unsigned shdata_count;
-               const VertexSetup *vertex_setup;
-               FaceWinding front_face;
-               CullMode face_cull;
-               const DepthTest *depth_test;
-               const StencilTest *stencil_test;
-               const Blend *blend;
-               unsigned object_lod_bias;
-
-               State();
+               const Framebuffer *framebuffer = 0;
+               const Rect *viewport = 0;
+               const Rect *scissor = 0;
+               unsigned texture_count = 0;
+               const Program *shprog = 0;
+               unsigned shdata_count = 0;
+               const VertexSetup *vertex_setup = 0;
+               FaceWinding front_face = NON_MANIFOLD;
+               CullMode face_cull = NO_CULL;
+               const DepthTest *depth_test = 0;
+               const StencilTest *stencil_test = 0;
+               const Blend *blend = 0;
+               unsigned object_lod_bias = 0;
        };
 
        enum ChangeMask
@@ -113,7 +107,7 @@ private:
                SHADER_DATA = 16
        };
 
-       unsigned char changed;
+       unsigned char changed = 0;
        std::vector<State> state_stack;
        State *state;
        std::vector<BoundTexture> texture_stack;
@@ -154,7 +148,6 @@ public:
        DEPRECATED void set_material(const Material *);
 
        DEPRECATED void set_lighting(const Lighting *);
-       void set_clipping(const Clipping *);
 
        /** Sets the shader program to use.  An initial set of data can be set as
        well, with the same semantics as add_shader_data. */