Add checks for invalid state in OpenGLCommands

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

diff --git a/source/core/pipelinestate.h b/source/core/pipelinestate.h
index 31938829ec61186e0cc6863fe7870640e898ebf1..5e59330953e9e29f179323a9001b7487da2d65fa 100644 (file)
--- a/source/core/pipelinestate.h
+++ b/source/core/pipelinestate.h
@@ -5,6 +5,7 @@
 #include <msp/core/noncopyable.h>
 #include "cullface.h"
 #include "pipelinestate_backend.h"
+#include "primitivetype.h"
 
 namespace Msp {
 namespace GL {
@@ -61,7 +62,8 @@ private:
                FACE_CULL = 128,
                DEPTH_TEST = 256,
                STENCIL_TEST = 512,
-               BLEND = 1024
+               BLEND = 1024,
+               PRIMITIVE_TYPE = 2048
        };
 
        const Framebuffer *framebuffer = 0;
@@ -71,12 +73,12 @@ private:
        std::vector<BoundUniformBlock> uniform_blocks;
        std::vector<BoundTexture> textures;
        const VertexSetup *vertex_setup = 0;
+       PrimitiveType primitive_type = TRIANGLES;
        FaceWinding front_face = COUNTERCLOCKWISE;
        CullMode face_cull = NO_CULL;
        const DepthTest *depth_test = 0;
        const StencilTest *stencil_test = 0;
        const Blend *blend = 0;
-       mutable unsigned changes = 0;
 
        template<typename T>
        void set(T &, T, unsigned);
@@ -88,6 +90,7 @@ public:
        void set_uniform_block(int, const UniformBlock *);
        void set_texture(unsigned, const Texture *, const Sampler *);
        void set_vertex_setup(const VertexSetup *);
+       void set_primitive_type(PrimitiveType);
        void set_front_face(FaceWinding);
        void set_face_cull(CullMode);
        void set_depth_test(const DepthTest *);