X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fpipelinestate.h;h=9573f9fede7eecc28a61bd7651728bb828c740cf;hb=8366f8951984aa436938b1bb18a57067ff2260c1;hp=5c3bb9ceb997e51876b4e6a650aae8c350955181;hpb=b466adff89db080c304ac3178ce1f4fef844cb28;p=libs%2Fgl.git

diff --git a/source/core/pipelinestate.h b/source/core/pipelinestate.h
index 5c3bb9ce..9573f9fe 100644
--- a/source/core/pipelinestate.h
+++ b/source/core/pipelinestate.h
@@ -76,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();
@@ -94,15 +96,12 @@ public:
 	void set_face_cull(CullMode);
 	void set_enabled_clip_planes(unsigned);
 	void set_texture(unsigned, const Texture *, const Sampler *);
-	void set_uniforms(const DefaultUniformBlock *);
-	void set_uniform_block(unsigned, const BufferBackedUniformBlock *);
-private:
-	void set_uniform_block_(int, const UniformBlock *);
-public:
+	void set_uniform_block(int, const UniformBlock *);
 	void set_depth_test(const DepthTest *);
 	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; }