X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fopengl%2Fpipelinestate_backend.cpp;h=91789701705d31441a55864f80a4e337d84cfdae;hb=8a8cce8ef4ee28b3572a72958b8b407759f9f826;hp=738de3ac5fea34250f29659a09752e2208d497e7;hpb=160e9eea29bd10034733d59507fa1bcca36be401;p=libs%2Fgl.git

diff --git a/source/backends/opengl/pipelinestate_backend.cpp b/source/backends/opengl/pipelinestate_backend.cpp
index 738de3ac..91789701 100644
--- a/source/backends/opengl/pipelinestate_backend.cpp
+++ b/source/backends/opengl/pipelinestate_backend.cpp
@@ -8,7 +8,7 @@
 #include "blend.h"
 #include "buffer.h"
 #include "depthtest.h"
-#include "deviceinfo.h"
+#include "device.h"
 #include "framebuffer.h"
 #include "gl.h"
 #include "pipelinestate.h"
@@ -30,13 +30,14 @@ const OpenGLPipelineState *OpenGLPipelineState::last_applied = 0;
 vector<int> OpenGLPipelineState::bound_tex_targets;
 vector<char> OpenGLPipelineState::bound_uniform_blocks;
 unsigned OpenGLPipelineState::restart_index = 0;
+unsigned OpenGLPipelineState::n_clip_distances = 0;
 
 OpenGLPipelineState::OpenGLPipelineState()
 {
 	if(bound_tex_targets.empty())
-		bound_tex_targets.resize(DeviceInfo::get_global().limits.max_texture_bindings);
+		bound_tex_targets.resize(Device::get_current().get_info().limits.max_texture_bindings);
 	if(bound_uniform_blocks.empty())
-		bound_uniform_blocks.resize(DeviceInfo::get_global().limits.max_uniform_bindings);
+		bound_uniform_blocks.resize(Device::get_current().get_info().limits.max_uniform_bindings);
 }
 
 OpenGLPipelineState::~OpenGLPipelineState()
@@ -88,51 +89,45 @@ void OpenGLPipelineState::apply(unsigned mask) const
 	}
 
 	if(mask&PipelineState::SHPROG)
+	{
 		glUseProgram(self->shprog ? self->shprog->id : 0);
 
-	if(mask&PipelineState::VERTEX_SETUP)
-	{
-		const VertexSetup *vertex_setup = self->vertex_setup;
-		glBindVertexArray(vertex_setup ? vertex_setup->id : 0);
-		if(vertex_setup)
+		unsigned ncd = (self->shprog ? self->shprog->get_n_clip_distances() : 0);
+		if(ncd!=n_clip_distances)
 		{
-			static Require _req(MSP_primitive_restart);
-
-			vertex_setup->refresh();
-			unsigned ri = (vertex_setup->get_index_type()==UNSIGNED_INT ? 0xFFFFFFFF : 0xFFFF);
-			if(ri!=restart_index)
+			for(unsigned i=0; (i<ncd || i<n_clip_distances); ++i)
 			{
-				if(!restart_index)
-					glEnable(GL_PRIMITIVE_RESTART);
-				glPrimitiveRestartIndex(ri);
-				restart_index = ri;
+				if(i<ncd)
+					glEnable(GL_CLIP_PLANE0+i);
+				else
+					glDisable(GL_CLIP_PLANE0+i);
 			}
+			n_clip_distances = ncd;
 		}
 	}
 
-	if(mask&PipelineState::FACE_CULL)
+	if(mask&PipelineState::UNIFORMS)
 	{
-		glFrontFace(self->front_face==CLOCKWISE ? GL_CW : GL_CCW);
-
-		if(self->face_cull!=NO_CULL && self->front_face!=NON_MANIFOLD)
-		{
-			glEnable(GL_CULL_FACE);
-			glCullFace(self->face_cull==CULL_FRONT ? GL_FRONT : GL_BACK);
-		}
-		else
-			glDisable(GL_CULL_FACE);
-	}
+		for(const PipelineState::BoundUniformBlock &u: self->uniform_blocks)
+			if(u.changed || mask==~0U)
+			{
+				if(u.block)
+				{
+					if(u.binding>=0)
+					{
+						glBindBufferRange(GL_UNIFORM_BUFFER, u.binding, u.block->get_buffer()->id, u.block->get_offset(), u.block->get_data_size());
+						bound_uniform_blocks[u.binding] = 1;
+					}
+					else if(self->shprog)
+					{
+						const char *data = static_cast<const char *>(u.block->get_data_pointer());
+						for(const Program::UniformCall &call: self->shprog->uniform_calls)
+							call.func(call.location, call.size, data+call.location*16);
+					}
+				}
 
-	if(mask&PipelineState::CLIP_PLANES)
-	{
-		unsigned max_clip_planes = DeviceInfo::get_global().limits.max_clip_planes;
-		for(unsigned i=0; i<max_clip_planes; ++i)
-		{
-			if((self->enabled_clip_planes>>i)&1)
-				glEnable(GL_CLIP_PLANE0+i);
-			else
-				glDisable(GL_CLIP_PLANE0+i);
-		}
+				u.changed = false;
+			}
 	}
 
 	if(mask&PipelineState::TEXTURES)
@@ -162,28 +157,37 @@ void OpenGLPipelineState::apply(unsigned mask) const
 			}
 	}
 
-	if(mask&PipelineState::UNIFORMS)
+	if(mask&PipelineState::VERTEX_SETUP)
 	{
-		for(const PipelineState::BoundUniformBlock &u: self->uniform_blocks)
-			if(u.changed || mask==~0U)
-			{
-				if(u.block)
-				{
-					if(u.binding>=0)
-					{
-						glBindBufferRange(GL_UNIFORM_BUFFER, u.binding, u.block->get_buffer()->id, u.block->get_offset(), u.block->get_data_size());
-						bound_uniform_blocks[u.binding] = 1;
-					}
-					else if(self->shprog)
-					{
-						const char *data = static_cast<const char *>(u.block->get_data_pointer());
-						for(const Program::UniformCall &call: self->shprog->uniform_calls)
-							call.func(call.location, call.size, data+call.location*16);
-					}
-				}
+		const VertexSetup *vertex_setup = self->vertex_setup;
+		glBindVertexArray(vertex_setup ? vertex_setup->id : 0);
+		if(vertex_setup)
+		{
+			static Require _req(MSP_primitive_restart);
 
-				u.changed = false;
+			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&PipelineState::FACE_CULL)
+	{
+		glFrontFace(self->front_face==CLOCKWISE ? GL_CW : GL_CCW);
+
+		if(self->face_cull!=NO_CULL && self->front_face!=NON_MANIFOLD)
+		{
+			glEnable(GL_CULL_FACE);
+			glCullFace(self->face_cull==CULL_FRONT ? GL_FRONT : GL_BACK);
+		}
+		else
+			glDisable(GL_CULL_FACE);
 	}
 
 	if(mask&PipelineState::DEPTH_TEST)
@@ -243,11 +247,9 @@ void OpenGLPipelineState::clear()
 		glUseProgram(0);
 		glBindVertexArray(0);
 
-		unsigned max_clip_planes = DeviceInfo::get_global().limits.max_clip_planes;
-		unsigned enabled_clip_planes = static_cast<const PipelineState *>(last_applied)->enabled_clip_planes;
-		for(unsigned i=0; i<max_clip_planes; ++i)
-			if((enabled_clip_planes>>i)&1)
-				glDisable(GL_CLIP_PLANE0+i);
+		for(unsigned i=0; i<n_clip_distances; ++i)
+			glDisable(GL_CLIP_PLANE0+i);
+		n_clip_distances = 0;
 
 		for(unsigned i=0; i<bound_tex_targets.size(); ++i)
 			if(bound_tex_targets[i])