X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frender%2Frenderer.h;h=42515e822993b622a163d5eb454359bf0a86f145;hp=1a84d8bf8507c50d596bc3d1490a289f8c2f5855;hb=77a534371433054384d213922a2e8c55f8a69ad6;hpb=acb4aba95c22fa7c72eeef10befd611570d35182

diff --git a/source/render/renderer.h b/source/render/renderer.h
index 1a84d8bf..42515e82 100644
--- a/source/render/renderer.h
+++ b/source/render/renderer.h
@@ -3,7 +3,9 @@
 
 #include <set>
 #include <vector>
+#include "commands.h"
 #include "matrix.h"
+#include "pipelinestate.h"
 #include "programdata.h"
 #include "tag.h"
 
@@ -13,17 +15,16 @@ namespace GL {
 class Batch;
 class Buffer;
 class Camera;
-class Clipping;
+union ClearValue;
 class Material;
 class Mesh;
 class Lighting;
 class Program;
+class QueryPool;
 class Renderable;
 class Sampler;
 class Texture;
-class Texturing;
 class VertexSetup;
-class WindingTest;
 
 /**
 A class for supervising the rendering process.  While many Renderables (in
@@ -67,52 +68,45 @@ private:
 	struct BoundTexture
 	{
 		Tag tag;
-		mutable int unit;
-		const Texture *texture;
-		const Sampler *sampler;
-		int replaced;
-
-		BoundTexture();
+		mutable int unit = -1;
+		const Texture *texture = 0;
+		const Sampler *sampler = 0;
+		int replaced = -1;
 	};
 
 	struct BoundProgramData
 	{
 		const ProgramData *shdata;
-		mutable unsigned generation;
+		mutable unsigned generation = 0;
 
 		BoundProgramData(const ProgramData *);
 	};
 
 	struct State
 	{
-		const Camera *camera;
-		Matrix modelview_matrix;
-		unsigned texture_count;
-		unsigned lowest_effect_texunit;
-		const Material *material;
-		const Lighting *lighting;
-		Matrix lighting_matrix;
-		const Clipping *clipping;
-		Matrix clipping_matrix;
-		const Program *shprog;
-		unsigned shdata_count;
-		const VertexSetup *vertex_setup;
-		const WindingTest *winding_test;
-		bool reverse_winding;
-		unsigned object_lod_bias;
-
-		State();
+		const Camera *camera = 0;
+		Matrix model_matrix;
+		const Framebuffer *framebuffer = 0;
+		const Rect *viewport = 0;
+		const Rect *scissor = 0;
+		unsigned texture_count = 0;
+		const Program *shprog = 0;
+		unsigned shdata_count = 0;
+		const VertexSetup *vertex_setup = 0;
+		FaceWinding front_face = NON_MANIFOLD;
+		CullMode face_cull = NO_CULL;
+		const DepthTest *depth_test = 0;
+		const StencilTest *stencil_test = 0;
+		const Blend *blend = 0;
+		unsigned object_lod_bias = 0;
 	};
 
 	enum ChangeMask
 	{
 		MATRIX = 2,
-		SHADER_DATA = 16,
-		MATERIAL_SHDATA = 32,
-		STANDARD_SHDATA = 64
+		SHADER_DATA = 16
 	};
 
-	const Camera *default_camera;
 	unsigned char changed;
 	std::vector<State> state_stack;
 	State *state;
@@ -120,45 +114,40 @@ private:
 	ProgramData standard_shdata;
 	std::vector<BoundProgramData> shdata_stack;
 	std::set<const Renderable *> excluded;
+	PipelineState pipeline_state;
+	Commands commands;
 
 public:
 	Renderer();
-	DEPRECATED Renderer(const Camera *);
-private:
-	void init();
-public:
 	~Renderer();
 
-	/** Sets the camera to render from.  The modelview matrix is reset to the
-	camera's view matrix. */
+	/** Sets the camera to render from.  The model matrix is reset to identity. */
 	void set_camera(const Camera &);
 
 	const Camera *get_camera() const { return state->camera; }
 
-	/** Replaces the Renderer's modelview matrix. */
+	/** Replaces the Renderer's model matrix. */
 	void set_matrix(const Matrix &);
 
-	/** Applies a transform to the Renderer's modelview matrix. */
+	/** Applies a transform to the Renderer's model matrix. */
 	void transform(const Matrix &);
 
-	/** Returns the current modelview matrix. */
-	const Matrix &get_matrix() const { return state->modelview_matrix; }
+	/** Returns the current model matrix. */
+	const Matrix &get_matrix() const { return state->model_matrix; }
+
+	void set_framebuffer(const Framebuffer *);
+	void set_viewport(const Rect *);
+	void set_scissor(const Rect *);
+
+	const Framebuffer *get_framebuffer() const { return state->framebuffer; }
 
 	void set_texture(Tag, const Texture *, const Sampler * = 0);
 private:
-	void set_texture(Tag, int, const Texture *, const Sampler *);
 	void flush_textures();
 public:
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-	DEPRECATED void set_texture(const Texture *, const Sampler * = 0);
-	DEPRECATED void set_texturing(const Texturing *);
-	DEPRECATED unsigned allocate_effect_texunit();
-#pragma GCC diagnostic pop
-	void set_material(const Material *);
+	DEPRECATED void set_material(const Material *);
 
-	void set_lighting(const Lighting *);
-	void set_clipping(const Clipping *);
+	DEPRECATED void set_lighting(const Lighting *);
 
 	/** Sets the shader program to use.  An initial set of data can be set as
 	well, with the same semantics as add_shader_data. */
@@ -169,11 +158,18 @@ public:
 	Renderer state is popped. */
 	void add_shader_data(const ProgramData &data);
 
-	void flush_shader_data();
+	DEPRECATED void flush_shader_data() { flush_shader_data_(); }
+private:
+	void flush_shader_data_();
 
+public:
 	void set_vertex_setup(const VertexSetup *);
-	void set_winding_test(const WindingTest *);
-	void set_reverse_winding(bool);
+	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_object_lod_bias(unsigned);
 	unsigned get_object_lod_bias() const { return state->object_lod_bias; }
@@ -193,10 +189,17 @@ public:
 	void exclude(const Renderable &);
 	void include(const Renderable &);
 
+	void clear(const ClearValue *);
+
 	void render(const Renderable &, Tag = Tag());
 	void draw(const Batch &);
 	void draw_instanced(const Batch &, unsigned);
 
+	void resolve_multisample(Framebuffer &);
+
+	void begin_query(const QueryPool &, unsigned);
+	void end_query(const QueryPool &, unsigned);
+
 private:
 	void apply_state();
 };