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

diff --git a/source/core/pipelinestate.cpp b/source/core/pipelinestate.cpp
index 66188d91..0d91f759 100644
--- a/source/core/pipelinestate.cpp
+++ b/source/core/pipelinestate.cpp
@@ -5,10 +5,16 @@
 #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"
 #include "vertexsetup.h"
@@ -20,13 +26,20 @@ 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),
 	face_cull(NO_CULL),
 	enabled_clip_planes(0),
+	depth_test(0),
+	stencil_test(0),
+	blend(0),
 	changes(0)
 {
 	if(!ARB_direct_state_access && bound_tex_targets.empty())
@@ -49,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);
@@ -114,6 +142,21 @@ void PipelineState::set_uniform_block_(int binding, const UniformBlock *block)
 	}
 }
 
+void PipelineState::set_depth_test(const DepthTest *dt)
+{
+	set(depth_test, dt, DEPTH_TEST);
+}
+
+void PipelineState::set_stencil_test(const StencilTest *st)
+{
+	set(stencil_test, st, STENCIL_TEST);
+}
+
+void PipelineState::set_blend(const Blend *b)
+{
+	set(blend, b, BLEND);
+}
+
 void PipelineState::apply() const
 {
 	apply(this==last_applied ? changes : ~0U);
@@ -121,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);
 
@@ -128,14 +200,26 @@ 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)
 	{
 		glFrontFace(front_face==CLOCKWISE ? GL_CW : GL_CCW);
 
-		if(face_cull!=NO_CULL)
+		if(face_cull!=NO_CULL && front_face!=NON_MANIFOLD)
 		{
 			glEnable(GL_CULL_FACE);
 			glCullFace(face_cull==CULL_FRONT ? GL_FRONT : GL_BACK);
@@ -188,7 +272,7 @@ void PipelineState::apply(unsigned mask) const
 		}
 
 		for(vector<BoundTexture>::const_iterator i=textures.begin(); i!=textures.end(); ++i)
-			if(i->changed)
+			if(i->changed || mask==~0U)
 			{
 				if(i->texture && i->sampler)
 				{
@@ -245,7 +329,7 @@ void PipelineState::apply(unsigned mask) const
 		}
 
 		for(vector<BoundUniformBlock>::const_iterator i=uniform_blocks.begin(); i!=uniform_blocks.end(); ++i)
-			if(i->changed)
+			if(i->changed || mask==~0U)
 			{
 				if(i->block)
 				{
@@ -264,6 +348,44 @@ void PipelineState::apply(unsigned mask) const
 			}
 	}
 
+	if(mask&DEPTH_TEST)
+	{
+		if(depth_test && depth_test->enabled)
+		{
+			glEnable(GL_DEPTH_TEST);
+			glDepthFunc(get_gl_predicate(depth_test->compare));
+		}
+		else
+			glDisable(GL_DEPTH_TEST);
+
+		glDepthMask(!depth_test || depth_test->write);
+	}
+
+	if(mask&STENCIL_TEST)
+	{
+		if(stencil_test && stencil_test->enabled)
+		{
+			glEnable(GL_STENCIL_TEST);
+			glStencilFunc(get_gl_predicate(stencil_test->compare), stencil_test->reference, 0xFFFFFFFF);
+			glStencilOp(get_gl_stencil_op(stencil_test->stencil_fail_op), get_gl_stencil_op(stencil_test->depth_fail_op), get_gl_stencil_op(stencil_test->depth_pass_op));
+		}
+		else
+			glDisable(GL_STENCIL_TEST);
+	}
+
+	if(mask&BLEND)
+	{
+		if(blend && blend->enabled)
+		{
+			glEnable(GL_BLEND);
+			glBlendEquation(get_gl_blend_equation(blend->equation));
+			glBlendFunc(get_gl_blend_factor(blend->src_factor), get_gl_blend_factor(blend->dst_factor));
+			glBlendColor(blend->constant.r, blend->constant.g, blend->constant.b, blend->constant.a);
+		}
+		else
+			glDisable(GL_BLEND);
+	}
+
 	last_applied = this;
 	changes &= ~mask;
 }
@@ -297,6 +419,11 @@ void PipelineState::clear()
 			if(i->block)
 				glBindBufferBase(GL_UNIFORM_BUFFER, i->binding, 0);
 
+		glDisable(GL_DEPTH_TEST);
+		glDepthMask(true);
+		glDisable(GL_STENCIL_TEST);
+		glDisable(GL_BLEND);
+
 		last_applied = 0;
 	}
 }