X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fpipelinestate.cpp;h=0d91f759e055bb9d5a7febf80445899f2db59ff0;hb=91d87a3ecae2b21a87829442d82e65f071009e92;hp=167e7de05bfb0c629ba08327b72c5a7d3085317d;hpb=ce3658993ce2f6b7527a04a36a5e1af349c6f2e9;p=libs%2Fgl.git

diff --git a/source/core/pipelinestate.cpp b/source/core/pipelinestate.cpp
index 167e7de0..0d91f759 100644
--- a/source/core/pipelinestate.cpp
+++ b/source/core/pipelinestate.cpp
@@ -5,6 +5,7 @@
 #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"
@@ -25,6 +26,7 @@ namespace GL {
 
 const PipelineState *PipelineState::last_applied = 0;
 vector<int> PipelineState::bound_tex_targets;
+unsigned PipelineState::restart_index = 0;
 
 PipelineState::PipelineState():
 	framebuffer(0),
@@ -198,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)