X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fpipelinestate.h;h=b9fac143c7b9784773970b5710de7f9bdb9e80d8;hb=e92de029768eef5f0fd744329e589161b46d0762;hp=9f6795f16ec176d0cb4204354dcd7b4b7a4ad53e;hpb=ce3658993ce2f6b7527a04a36a5e1af349c6f2e9;p=libs%2Fgl.git

diff --git a/source/core/pipelinestate.h b/source/core/pipelinestate.h
index 9f6795f1..b9fac143 100644
--- a/source/core/pipelinestate.h
+++ b/source/core/pipelinestate.h
@@ -1,5 +1,5 @@
-#ifndef PIPELINESTATE_H_
-#define PIPELINESTATE_H_
+#ifndef MSP_GL_PIPELINESTATE_H_
+#define MSP_GL_PIPELINESTATE_H_
 
 #include <vector>
 #include <msp/core/noncopyable.h>
@@ -20,7 +20,6 @@ class StencilTest;
 class Texture;
 class UniformBlock;
 class VertexSetup;
-class WindingTest;
 
 class PipelineState: public NonCopyable
 {
@@ -77,6 +76,8 @@ private:
 
 	static const PipelineState *last_applied;
 	static std::vector<int> bound_tex_targets;
+	static std::vector<char> bound_uniform_blocks;
+	static unsigned restart_index;
 
 public:
 	PipelineState();
@@ -104,6 +105,7 @@ public:
 	void set_stencil_test(const StencilTest *);
 	void set_blend(const Blend *);
 
+	const Framebuffer *get_framebuffer() const { return framebuffer; }
 	const Program *get_shader_program() const { return shprog; }
 	const VertexSetup *get_vertex_setup() const { return vertex_setup; }
 	FaceWinding get_front_face() const { return front_face; }