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

diff --git a/source/core/pipelinestate.cpp b/source/core/pipelinestate.cpp
index 673fa701..7a38eab5 100644
--- a/source/core/pipelinestate.cpp
+++ b/source/core/pipelinestate.cpp
@@ -5,10 +5,13 @@
 #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 "blend.h"
 #include "buffer.h"
 #include "deviceinfo.h"
+#include "depthtest.h"
 #include "pipelinestate.h"
 #include "program.h"
+#include "stenciltest.h"
 #include "texture.h"
 #include "uniformblock.h"
 #include "vertexsetup.h"
@@ -27,6 +30,9 @@ PipelineState::PipelineState():
 	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())
@@ -114,6 +120,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);
@@ -264,6 +285,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 +356,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;
 	}
 }