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

diff --git a/source/render/renderer.h b/source/render/renderer.h
index 4c24068e..ffaa917d 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.
@@ -98,18 +100,17 @@ 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;
 	Commands commands;
 
 public:
 	Renderer();
-	~Renderer();
 
 	/** Begins rendering, allowing commands to be issued. */
 	void begin();
@@ -118,6 +119,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 +141,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; }