X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Frenderer.h;h=c176f87aa231664f5eccfb442317421737004f47;hb=511579d9ad9337bc3db1da1a486b3692d1c5cf1e;hp=4c24068e03cb7a4e792c020575c997623423d346;hpb=904ca5cf3923da3b1e6f68af941e7fc9ad6b7ed4;p=libs%2Fgl.git

diff --git a/source/render/renderer.h b/source/render/renderer.h
index 4c24068e..c176f87a 100644
--- a/source/render/renderer.h
+++ b/source/render/renderer.h
@@ -5,8 +5,8 @@
 #include <vector>
 #include "commands.h"
 #include "matrix.h"
-#include "pipelinestate.h"
 #include "programdata.h"
+#include "renderer_backend.h"
 #include "tag.h"
 
 namespace Msp {
@@ -39,8 +39,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 +64,7 @@ private:
 		mutable int binding = -1;
 		const Texture *texture = 0;
 		const Sampler *sampler = 0;
+		int level = -1;
 		int replaced = -1;
 	};
 
@@ -98,18 +101,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 +121,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();
 
@@ -137,9 +143,6 @@ public:
 	/** Replaces the Renderer's model matrix. */
 	void set_matrix(const Matrix &);
 
-	/** Applies a transform to the Renderer's model matrix. */
-	void transform(const Matrix &);
-
 	/** Returns the current model matrix. */
 	const Matrix &get_matrix() const { return get_state().model_matrix; }
 
@@ -159,6 +162,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();
@@ -176,7 +180,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 &);
@@ -192,6 +199,7 @@ public:
 	void end_query(const QueryPool &, unsigned);
 
 private:
+	void apply_framebuffer();
 	void apply_state();
 };