X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fpipelinestate.cpp;h=0d91f759e055bb9d5a7febf80445899f2db59ff0;hb=ebef7085e2672866189ccdb3a89e977e678a89b9;hp=7a38eab5e4136a12e490e4bdcbb079872e181de1;hpb=2b2676392aff2eb6b38c3e463cc67f4d67a4ef8b;p=libs%2Fgl.git

diff --git a/source/core/pipelinestate.cpp b/source/core/pipelinestate.cpp
index 7a38eab5..0d91f759 100644
--- a/source/core/pipelinestate.cpp
+++ b/source/core/pipelinestate.cpp
@@ -5,12 +5,15 @@
 #include <msp/gl/extensions/arb_shader_objects.h>
 #include <msp/gl/extensions/arb_uniform_buffer_object.h>
 #include <msp/gl/extensions/arb_vertex_array_object.h>
+#include <msp/gl/extensions/msp_primitive_restart.h>
 #include "blend.h"
 #include "buffer.h"
 #include "deviceinfo.h"
 #include "depthtest.h"
+#include "framebuffer.h"
 #include "pipelinestate.h"
 #include "program.h"
+#include "rect.h"
 #include "stenciltest.h"
 #include "texture.h"
 #include "uniformblock.h"
@@ -23,8 +26,12 @@ namespace GL {
 
 const PipelineState *PipelineState::last_applied = 0;
 vector<int> PipelineState::bound_tex_targets;
+unsigned PipelineState::restart_index = 0;
 
 PipelineState::PipelineState():
+	framebuffer(0),
+	viewport(0),
+	scissor(0),
 	shprog(0),
 	vertex_setup(0),
 	front_face(COUNTERCLOCKWISE),
@@ -55,6 +62,21 @@ void PipelineState::set(T &target, T value, unsigned flag)
 	}
 }
 
+void PipelineState::set_framebuffer(const Framebuffer *f)
+{
+	set(framebuffer, f, FRAMEBUFFER|VIEWPORT);
+}
+
+void PipelineState::set_viewport(const Rect *v)
+{
+	set(viewport, v, VIEWPORT);
+}
+
+void PipelineState::set_scissor(const Rect *s)
+{
+	set(scissor, s, SCISSOR);
+}
+
 void PipelineState::set_shader_program(const Program *p)
 {
 	set(shprog, p, SHPROG);
@@ -142,6 +164,35 @@ void PipelineState::apply() const
 
 void PipelineState::apply(unsigned mask) const
 {
+	if(mask&FRAMEBUFFER)
+	{
+		glBindFramebuffer(GL_FRAMEBUFFER, framebuffer ? framebuffer->get_id() : 0);
+		if(framebuffer)
+		{
+			framebuffer->refresh();
+			framebuffer->require_complete();
+		}
+	}
+
+	if(mask&VIEWPORT)
+	{
+		if(viewport)
+			glViewport(viewport->left, viewport->bottom, viewport->width, viewport->height);
+		else if(framebuffer)
+			glViewport(0, 0, framebuffer->get_width(), framebuffer->get_height());
+	}
+
+	if(mask&SCISSOR)
+	{
+		if(scissor)
+		{
+			glEnable(GL_SCISSOR_TEST);
+			glScissor(scissor->left, scissor->bottom, scissor->width, scissor->height);
+		}
+		else
+			glDisable(GL_SCISSOR_TEST);
+	}
+
 	if(mask&SHPROG)
 		glUseProgram(shprog ? shprog->get_id() : 0);
 
@@ -149,7 +200,19 @@ void PipelineState::apply(unsigned mask) const
 	{
 		glBindVertexArray(vertex_setup ? vertex_setup->get_id() : 0);
 		if(vertex_setup)
+		{
+			static Require _req(MSP_primitive_restart);
+
 			vertex_setup->refresh();
+			unsigned ri = (vertex_setup->get_index_type()==UNSIGNED_INT ? 0xFFFFFFFF : 0xFFFF);
+			if(ri!=restart_index)
+			{
+				if(!restart_index)
+					glEnable(GL_PRIMITIVE_RESTART);
+				glPrimitiveRestartIndex(ri);
+				restart_index = ri;
+			}
+		}
 	}
 
 	if(mask&FACE_CULL)