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

diff --git a/source/core/pipelinestate.h b/source/core/pipelinestate.h
index 8d1d1aaa..b9fac143 100644
--- a/source/core/pipelinestate.h
+++ b/source/core/pipelinestate.h
@@ -1,20 +1,25 @@
-#ifndef PIPELINESTATE_H_
-#define PIPELINESTATE_H_
+#ifndef MSP_GL_PIPELINESTATE_H_
+#define MSP_GL_PIPELINESTATE_H_
 
 #include <vector>
 #include <msp/core/noncopyable.h>
+#include "cullface.h"
 
 namespace Msp {
 namespace GL {
 
+class Blend;
 class BufferBackedUniformBlock;
 class DefaultUniformBlock;
+class DepthTest;
+class Framebuffer;
 class Program;
+class Rect;
 class Sampler;
+class StencilTest;
 class Texture;
 class UniformBlock;
 class VertexSetup;
-class WindingTest;
 
 class PipelineState: public NonCopyable
 {
@@ -42,30 +47,53 @@ private:
 	{
 		SHPROG = 1,
 		VERTEX_SETUP = 2,
-		WINDING_TEST = 4,
+		FACE_CULL = 4,
 		CLIP_PLANES = 8,
 		TEXTURES = 16,
-		UNIFORMS = 32
+		UNIFORMS = 32,
+		DEPTH_TEST = 64,
+		STENCIL_TEST = 128,
+		BLEND = 256,
+		FRAMEBUFFER = 512,
+		VIEWPORT = 1024,
+		SCISSOR = 2048
 	};
 
+	const Framebuffer *framebuffer;
+	const Rect *viewport;
+	const Rect *scissor;
 	const Program *shprog;
 	const VertexSetup *vertex_setup;
-	const WindingTest *winding_test;
+	FaceWinding front_face;
+	CullMode face_cull;
 	unsigned enabled_clip_planes;
 	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();
 
+private:
+	template<typename T>
+	void set(T &, T, unsigned);
+public:
+	void set_framebuffer(const Framebuffer *);
+	void set_viewport(const Rect *);
+	void set_scissor(const Rect *);
 	void set_shader_program(const Program *);
 	void set_vertex_setup(const VertexSetup *);
-	void set_winding_test(const WindingTest *);
+	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_uniforms(const DefaultUniformBlock *);
@@ -73,10 +101,15 @@ public:
 private:
 	void set_uniform_block_(int, const UniformBlock *);
 public:
+	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; }
-	const WindingTest *get_winding_test() const { return winding_test; }
+	FaceWinding get_front_face() const { return front_face; }
+	CullMode get_face_cull() const { return face_cull; }
 
 	void apply() const;
 private: