X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fpipelinestate.h;h=28624ed7ca64a5a0e5bba111cf45b27477bb11e5;hb=3efe3bab1c8290bd49a957ebec0ad97e58a35fcf;hp=89cf1cd7261df3c29f20cb769eddc6e6c6c93bb7;hpb=58c5647c775e38dd08a64ad435dfe0673a62fcd1;p=libs%2Fgl.git

diff --git a/source/core/pipelinestate.h b/source/core/pipelinestate.h
index 89cf1cd7..28624ed7 100644
--- a/source/core/pipelinestate.h
+++ b/source/core/pipelinestate.h
@@ -3,20 +3,21 @@
 
 #include <vector>
 #include <msp/core/noncopyable.h>
+#include "blend.h"
 #include "cullface.h"
+#include "depthtest.h"
 #include "pipelinestate_backend.h"
 #include "primitivetype.h"
+#include "rect.h"
+#include "stenciltest.h"
 
 namespace Msp {
 namespace GL {
 
-class Blend;
-class DepthTest;
+class Buffer;
 class Framebuffer;
 class Program;
-class Rect;
 class Sampler;
-class StencilTest;
 class Texture;
 class UniformBlock;
 class VertexSetup;
@@ -38,6 +39,7 @@ private:
 		mutable bool used = false;
 		const Texture *texture = 0;
 		const Sampler *sampler = 0;
+		int level = -1;
 
 		BoundTexture(unsigned b): binding(b) { }
 	};
@@ -48,6 +50,7 @@ private:
 		mutable bool changed = false;
 		mutable bool used = false;
 		const UniformBlock *block = 0;
+		const Buffer *buffer = 0;
 
 		BoundUniformBlock(int b): binding(b) { }
 	};
@@ -69,8 +72,8 @@ private:
 	};
 
 	const Framebuffer *framebuffer = 0;
-	const Rect *viewport = 0;
-	const Rect *scissor = 0;
+	Rect viewport = Rect::max();
+	Rect scissor = Rect::max();
 	const Program *shprog = 0;
 	std::vector<BoundUniformBlock> uniform_blocks;
 	std::vector<BoundTexture> textures;
@@ -78,29 +81,30 @@ private:
 	PrimitiveType primitive_type = TRIANGLES;
 	FaceWinding front_face = COUNTERCLOCKWISE;
 	CullMode face_cull = NO_CULL;
-	const DepthTest *depth_test = 0;
-	const StencilTest *stencil_test = 0;
-	const Blend *blend = 0;
+	DepthTest depth_test;
+	StencilTest stencil_test;
+	Blend blend;
 
 	template<typename T>
-	void set(T &, T, unsigned);
+	void set(T &, const T &, unsigned);
 public:
 	void set_framebuffer(const Framebuffer *);
-	void set_viewport(const Rect *);
-	void set_scissor(const Rect *);
+	void set_viewport(const Rect &);
+	void set_scissor(const Rect &);
 	void set_shader_program(const Program *);
 	void set_uniform_block(int, const UniformBlock *);
 	void set_texture(unsigned, const Texture *, const Sampler *);
+	void set_texture(unsigned, const Texture *, int, const Sampler *);
 	void set_vertex_setup(const VertexSetup *);
 	void set_primitive_type(PrimitiveType);
 	void set_front_face(FaceWinding);
 	void set_face_cull(CullMode);
-	void set_depth_test(const DepthTest *);
-	void set_stencil_test(const StencilTest *);
-	void set_blend(const Blend *);
+	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 Rect *get_viewport() const { return viewport; }
+	const Rect &get_viewport() const { return viewport; }
 	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; }