X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Frenderer.h;h=51989f7711f8b84bd8a43a1eb8d872cb2a3cf7d2;hb=50492d9a5106b3dd76e3d6fa5ac88d9f97ba3c47;hp=575dbe67ee8af1e9adf758c3be0c7ca0caea3045;hpb=175153f224916b92d02a325aac5628956cda8daf;p=libs%2Fgl.git

diff --git a/source/render/renderer.h b/source/render/renderer.h
index 575dbe67..51989f77 100644
--- a/source/render/renderer.h
+++ b/source/render/renderer.h
@@ -4,25 +4,30 @@
 #include <set>
 #include <vector>
 #include "commands.h"
+#include "cullface.h"
 #include "matrix.h"
-#include "pipelinestate.h"
 #include "programdata.h"
+#include "renderer_backend.h"
 #include "tag.h"
 
 namespace Msp {
 namespace GL {
 
 class Batch;
+class Blend;
 class Buffer;
 class Camera;
 union ClearValue;
+class DepthTest;
 class Material;
 class Mesh;
 class Lighting;
 class Program;
 class QueryPool;
+struct Rect;
 class Renderable;
 class Sampler;
+class StencilTest;
 class Texture;
 class VertexSetup;
 
@@ -39,8 +44,10 @@ Renderables can save the state by pushing it on the stack before beginning
 their work, and pop it afterwards to restore it without disturbing state set
 by outer scopes.
 */
-class Renderer
+class Renderer: public RendererBackend
 {
+	friend RendererBackend;
+
 public:
 	/**
 	RAII helper class for pushing state on the stack.
@@ -62,6 +69,7 @@ private:
 		mutable int binding = -1;
 		const Texture *texture = 0;
 		const Sampler *sampler = 0;
+		int level = -1;
 		int replaced = -1;
 	};
 
@@ -98,18 +106,18 @@ private:
 		SHADER_DATA = 16
 	};
 
+	unsigned frame_index = 0;
 	unsigned char changed = 0;
 	std::vector<State> state_stack;
 	State *current_state = 0;
 	ProgramData standard_shdata;
 	std::vector<BoundProgramData> shdata_stack;
 	std::vector<BoundTexture> texture_stack;
-	PipelineState pipeline_state;
+	const Texture &placeholder_texture;
 	Commands commands;
 
 public:
 	Renderer();
-	~Renderer();
 
 	/** Begins rendering, allowing commands to be issued. */
 	void begin();
@@ -118,6 +126,9 @@ public:
 	commands are allowed before the next call to begin(). */
 	void end();
 
+	using RendererBackend::begin;
+	using RendererBackend::end;
+
 	/** Saves the current state so it can be restored later. */
 	void push_state();
 
@@ -156,6 +167,7 @@ public:
 	void add_shader_data(const ProgramData &data);
 
 	void set_texture(Tag, const Texture *, const Sampler * = 0);
+	void set_texture(Tag, const Texture *, int, const Sampler * = 0);
 
 private:
 	void flush_shader_data();
@@ -173,7 +185,10 @@ public:
 	void set_object_lod_bias(unsigned);
 	unsigned get_object_lod_bias() const { return get_state().object_lod_bias; }
 
-	void clear(const ClearValue *);
+	/** Clears framebuffer contents.  If values is not null, it must contain one
+	element for each attachment.  Otherwise the framebuffer contents are
+	discarded and become undefined. */
+	void clear(const ClearValue *values);
 
 	/** Draws a batch of primitives.  A shader must be active. */
 	void draw(const Batch &);
@@ -189,6 +204,7 @@ public:
 	void end_query(const QueryPool &, unsigned);
 
 private:
+	void apply_framebuffer();
 	void apply_state();
 };