X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fpipelinestate.h;h=42543e4dc2596f5de2e2c0a7c71e85f9b64fa4c8;hb=160e9eea29bd10034733d59507fa1bcca36be401;hp=b9fac143c7b9784773970b5710de7f9bdb9e80d8;hpb=3e38e8a7bfffb0b6d622b849b402f4f04a7536c4;p=libs%2Fgl.git

diff --git a/source/core/pipelinestate.h b/source/core/pipelinestate.h
index b9fac143..42543e4d 100644
--- a/source/core/pipelinestate.h
+++ b/source/core/pipelinestate.h
@@ -4,13 +4,12 @@
 #include <vector>
 #include <msp/core/noncopyable.h>
 #include "cullface.h"
+#include "pipelinestate_backend.h"
 
 namespace Msp {
 namespace GL {
 
 class Blend;
-class BufferBackedUniformBlock;
-class DefaultUniformBlock;
 class DepthTest;
 class Framebuffer;
 class Program;
@@ -21,8 +20,10 @@ class Texture;
 class UniformBlock;
 class VertexSetup;
 
-class PipelineState: public NonCopyable
+class PipelineState: public PipelineStateBackend
 {
+	friend PipelineStateBackend;
+
 private:
 	struct BoundTexture
 	{
@@ -74,14 +75,8 @@ private:
 	const Blend *blend;
 	mutable unsigned changes;
 
-	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();
-	~PipelineState();
 
 private:
 	template<typename T>
@@ -96,11 +91,7 @@ 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 *);
@@ -110,12 +101,6 @@ public:
 	const VertexSetup *get_vertex_setup() const { return vertex_setup; }
 	FaceWinding get_front_face() const { return front_face; }
 	CullMode get_face_cull() const { return face_cull; }
-
-	void apply() const;
-private:
-	void apply(unsigned) const;
-public:
-	static void clear();
 };
 
 } // namespace GL