X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbackends%2Fopengl%2Fpipelinestate_backend.cpp;h=08edc5e71a05d4a04a9932fbac0ff2de4f5e8144;hp=fb802995f6355e46a6794f07e6f4ec5d1b4e7593;hb=016f0f0dd51511f98d0bf398d99199d7dec1543c;hpb=511579d9ad9337bc3db1da1a486b3692d1c5cf1e

diff --git a/source/backends/opengl/pipelinestate_backend.cpp b/source/backends/opengl/pipelinestate_backend.cpp
index fb802995..08edc5e7 100644
--- a/source/backends/opengl/pipelinestate_backend.cpp
+++ b/source/backends/opengl/pipelinestate_backend.cpp
@@ -66,24 +66,27 @@ void OpenGLPipelineState::apply() const
 		}
 	}
 
-	if(mask&(PipelineState::VIEWPORT|PipelineState::FRAMEBUFFER))
-	{
-		if(const Rect *viewport = self.viewport)
-			glViewport(viewport->left, viewport->bottom, viewport->width, viewport->height);
-		else if(const Framebuffer *framebuffer = self.framebuffer)
-			glViewport(0, 0, framebuffer->get_width(), framebuffer->get_height());
-	}
-
-	if(mask&PipelineState::SCISSOR)
-	{
-		if(const Rect *scissor = self.scissor)
+	if(mask&(PipelineState::VIEWPORT|PipelineState::SCISSOR|PipelineState::FRAMEBUFFER))
+		if(const Framebuffer *framebuffer = self.framebuffer)
 		{
-			glEnable(GL_SCISSOR_TEST);
-			glScissor(scissor->left, scissor->bottom, scissor->width, scissor->height);
+			Rect fb_rect = framebuffer->get_rect();
+			if(mask&(PipelineState::VIEWPORT|PipelineState::FRAMEBUFFER))
+			{
+				Rect viewport = fb_rect.intersect(self.viewport);
+				glViewport(viewport.left, viewport.bottom, viewport.width, viewport.height);
+			}
+			if(mask&(PipelineState::SCISSOR|PipelineState::FRAMEBUFFER))
+			{
+				Rect scissor = fb_rect.intersect(self.scissor);
+				if(scissor!=fb_rect)
+				{
+					glEnable(GL_SCISSOR_TEST);
+					glScissor(scissor.left, scissor.bottom, scissor.width, scissor.height);
+				}
+				else
+					glDisable(GL_SCISSOR_TEST);
+			}
 		}
-		else
-			glDisable(GL_SCISSOR_TEST);
-	}
 
 	if(mask&PipelineState::SHPROG)
 	{
@@ -189,26 +192,26 @@ void OpenGLPipelineState::apply() const
 
 	if(mask&PipelineState::DEPTH_TEST)
 	{
-		const DepthTest *depth_test = self.depth_test;
-		if(depth_test && depth_test->enabled)
+		const DepthTest &depth_test = self.depth_test;
+		if(depth_test.enabled)
 		{
 			glEnable(GL_DEPTH_TEST);
-			glDepthFunc(get_gl_predicate(depth_test->compare));
+			glDepthFunc(get_gl_predicate(depth_test.compare));
 		}
 		else
 			glDisable(GL_DEPTH_TEST);
 
-		glDepthMask(!depth_test || depth_test->write);
+		glDepthMask(depth_test.write);
 	}
 
 	if(mask&PipelineState::STENCIL_TEST)
 	{
-		const StencilTest *stencil_test = self.stencil_test;
-		if(stencil_test && stencil_test->enabled)
+		const StencilTest &stencil_test = self.stencil_test;
+		if(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));
+			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);
@@ -216,14 +219,14 @@ void OpenGLPipelineState::apply() const
 
 	if(mask&PipelineState::BLEND)
 	{
-		const Blend *blend = self.blend;
-		if(blend && blend->enabled)
+		const Blend &blend = self.blend;
+		if(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);
-			ColorWriteMask cw = blend->write_mask;
+			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);
+			ColorWriteMask cw = blend.write_mask;
 			glColorMask((cw&WRITE_RED)!=0, (cw&WRITE_GREEN)!=0, (cw&WRITE_BLUE)!=0, (cw&WRITE_ALPHA)!=0);
 		}
 		else