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

diff --git a/source/core/pipelinestate.cpp b/source/core/pipelinestate.cpp
index 167e7de0..21cb64f9 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,8 @@ namespace GL {
 
 const PipelineState *PipelineState::last_applied = 0;
 vector<int> PipelineState::bound_tex_targets;
+vector<char> PipelineState::bound_uniform_blocks;
+unsigned PipelineState::restart_index = 0;
 
 PipelineState::PipelineState():
 	framebuffer(0),
@@ -40,8 +43,10 @@ PipelineState::PipelineState():
 	blend(0),
 	changes(0)
 {
-	if(!ARB_direct_state_access && bound_tex_targets.empty())
+	if(bound_tex_targets.empty())
 		bound_tex_targets.resize(Limits::get_global().max_texture_bindings);
+	if(bound_uniform_blocks.empty())
+		bound_uniform_blocks.resize(Limits::get_global().max_uniform_bindings);
 }
 
 PipelineState::~PipelineState()
@@ -198,7 +203,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)
@@ -228,35 +245,6 @@ void PipelineState::apply(unsigned mask) const
 
 	if(mask&TEXTURES)
 	{
-		if(last_applied && this!=last_applied)
-		{
-			vector<BoundTexture>::const_iterator i = textures.begin();
-			vector<BoundTexture>::const_iterator j = last_applied->textures.begin();
-			while(j!=last_applied->textures.end())
-			{
-				if(i==textures.end() || j->binding<i->binding)
-				{
-					if(bound_tex_targets[j->binding])
-					{
-						if(ARB_direct_state_access)
-							glBindTextureUnit(j->binding, 0);
-						else
-						{
-							glActiveTexture(GL_TEXTURE0+j->binding);
-							glBindTexture(bound_tex_targets[j->binding], 0);
-						}
-					}
-					++j;
-				}
-				else
-				{
-					if(i->binding==j->binding)
-						++j;
-					++i;
-				}
-			}
-		}
-
 		for(vector<BoundTexture>::const_iterator i=textures.begin(); i!=textures.end(); ++i)
 			if(i->changed || mask==~0U)
 			{
@@ -270,23 +258,13 @@ void PipelineState::apply(unsigned mask) const
 						if(bound_tex_targets[i->binding] && static_cast<int>(i->texture->get_target())!=bound_tex_targets[i->binding])
 							glBindTexture(bound_tex_targets[i->binding], 0);
 						glBindTexture(i->texture->get_target(), i->texture->get_id());
-						bound_tex_targets[i->binding] = i->texture->get_target();
 					}
 
+					bound_tex_targets[i->binding] = i->texture->get_target();
+
 					glBindSampler(i->binding, i->sampler->get_id());
 					i->sampler->refresh();
 				}
-				else if(bound_tex_targets[i->binding])
-				{
-					if(ARB_direct_state_access)
-						glBindTextureUnit(i->binding, 0);
-					else
-					{
-						glActiveTexture(GL_TEXTURE0+i->binding);
-						glBindTexture(bound_tex_targets[i->binding], 0);
-						bound_tex_targets[i->binding] = 0;
-					}
-				}
 
 				i->changed = false;
 			}
@@ -294,26 +272,6 @@ void PipelineState::apply(unsigned mask) const
 
 	if(mask&UNIFORMS)
 	{
-		if(last_applied && this!=last_applied)
-		{
-			vector<BoundUniformBlock>::const_iterator i = uniform_blocks.begin();
-			vector<BoundUniformBlock>::const_iterator j = last_applied->uniform_blocks.begin();
-			while(j!=last_applied->uniform_blocks.end())
-			{
-				if(i==uniform_blocks.end() || j->binding<i->binding)
-				{
-					glBindBufferBase(GL_UNIFORM_BUFFER, j->binding, 0);
-					++j;
-				}
-				else
-				{
-					if(i->binding==j->binding)
-						++j;
-					++i;
-				}
-			}
-		}
-
 		for(vector<BoundUniformBlock>::const_iterator i=uniform_blocks.begin(); i!=uniform_blocks.end(); ++i)
 			if(i->changed || mask==~0U)
 			{
@@ -323,12 +281,11 @@ void PipelineState::apply(unsigned mask) const
 					{
 						const BufferBackedUniformBlock *block = static_cast<const BufferBackedUniformBlock *>(i->block);
 						glBindBufferRange(GL_UNIFORM_BUFFER, i->binding, block->get_buffer()->get_id(), block->get_offset(), block->get_data_size());
+						bound_uniform_blocks[i->binding] = 1;
 					}
 					else
 						static_cast<const DefaultUniformBlock *>(i->block)->apply();
 				}
-				else
-					glBindBufferBase(GL_UNIFORM_BUFFER, i->binding, 0);
 
 				i->changed = false;
 			}
@@ -388,22 +345,25 @@ void PipelineState::clear()
 			if((last_applied->enabled_clip_planes>>i)&1)
 				glDisable(GL_CLIP_PLANE0+i);
 
-		for(vector<BoundTexture>::const_iterator i=last_applied->textures.begin(); i!=last_applied->textures.end(); ++i)
-			if(i->texture && i->sampler)
+		for(unsigned i=0; i<bound_tex_targets.size(); ++i)
+			if(bound_tex_targets[i])
 			{
 				if(ARB_direct_state_access)
-					glBindTextureUnit(i->binding, 0);
+					glBindTextureUnit(i, 0);
 				else
 				{
-					glActiveTexture(GL_TEXTURE0+i->binding);
-					glBindTexture(bound_tex_targets[i->binding], 0);
-					bound_tex_targets[i->binding] = 0;
+					glActiveTexture(GL_TEXTURE0+i);
+					glBindTexture(bound_tex_targets[i], 0);
 				}
+				bound_tex_targets[i] = 0;
 			}
 
-		for(vector<BoundUniformBlock>::const_iterator i=last_applied->uniform_blocks.begin(); i!=last_applied->uniform_blocks.end(); ++i)
-			if(i->block)
-				glBindBufferBase(GL_UNIFORM_BUFFER, i->binding, 0);
+		for(unsigned i=0; i<bound_uniform_blocks.size(); ++i)
+			if(bound_uniform_blocks[i])
+			{
+				glBindBufferBase(GL_UNIFORM_BUFFER, i, 0);
+				bound_uniform_blocks[i] = 0;
+			}
 
 		glDisable(GL_DEPTH_TEST);
 		glDepthMask(true);