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

diff --git a/source/core/pipelinestate.h b/source/core/pipelinestate.h
index 9573f9fe..47870536 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,15 @@ class Texture;
 class UniformBlock;
 class VertexSetup;
 
-class PipelineState: public NonCopyable
+/**
+Stores state for the entire GPU pipeline.
+
+Applications normally use the higher-level Renderer class rather than this.
+*/
+class PipelineState: public PipelineStateBackend
 {
+	friend PipelineStateBackend;
+
 private:
 	struct BoundTexture
 	{
@@ -48,7 +54,6 @@ private:
 		SHPROG = 1,
 		VERTEX_SETUP = 2,
 		FACE_CULL = 4,
-		CLIP_PLANES = 8,
 		TEXTURES = 16,
 		UNIFORMS = 32,
 		DEPTH_TEST = 64,
@@ -59,31 +64,20 @@ private:
 		SCISSOR = 2048
 	};
 
-	const Framebuffer *framebuffer;
-	const Rect *viewport;
-	const Rect *scissor;
-	const Program *shprog;
-	const VertexSetup *vertex_setup;
-	FaceWinding front_face;
-	CullMode face_cull;
-	unsigned enabled_clip_planes;
+	const Framebuffer *framebuffer = 0;
+	const Rect *viewport = 0;
+	const Rect *scissor = 0;
+	const Program *shprog = 0;
+	const VertexSetup *vertex_setup = 0;
+	FaceWinding front_face = COUNTERCLOCKWISE;
+	CullMode face_cull = NO_CULL;
 	std::vector<BoundTexture> textures;
 	std::vector<BoundUniformBlock> uniform_blocks;
-	const DepthTest *depth_test;
-	const StencilTest *stencil_test;
-	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();
+	const DepthTest *depth_test = 0;
+	const StencilTest *stencil_test = 0;
+	const Blend *blend = 0;
+	mutable unsigned changes = 0;
 
-private:
 	template<typename T>
 	void set(T &, T, unsigned);
 public:
@@ -94,7 +88,6 @@ public:
 	void set_vertex_setup(const VertexSetup *);
 	void set_front_face(FaceWinding);
 	void set_face_cull(CullMode);
-	void set_enabled_clip_planes(unsigned);
 	void set_texture(unsigned, const Texture *, const Sampler *);
 	void set_uniform_block(int, const UniformBlock *);
 	void set_depth_test(const DepthTest *);
@@ -106,12 +99,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