X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fpipelinestate.cpp;h=0306a2626c9c4cbde629e6fc236fb2648431ebc5;hp=21cb64f9f51bb88c5f7ccd02b4a5f65fb4006daf;hb=7ef75a4c4dbfc437e466381dd67c23357e607b82;hpb=f8bf444f26ce0bb392b96317ef3665be0af110aa

diff --git a/source/core/pipelinestate.cpp b/source/core/pipelinestate.cpp
index 21cb64f9..0306a262 100644
--- a/source/core/pipelinestate.cpp
+++ b/source/core/pipelinestate.cpp
@@ -1,60 +1,12 @@
 #include <stdexcept>
 #include <msp/core/algorithm.h>
-#include <msp/gl/extensions/arb_direct_state_access.h>
-#include <msp/gl/extensions/arb_sampler_objects.h>
-#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"
 
 using namespace std;
 
 namespace Msp {
 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),
-	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(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()
-{
-	if(this==last_applied)
-		last_applied = 0;
-}
-
 template<typename T>
 void PipelineState::set(T &target, T value, unsigned flag)
 {
@@ -67,7 +19,7 @@ void PipelineState::set(T &target, T value, unsigned flag)
 
 void PipelineState::set_framebuffer(const Framebuffer *f)
 {
-	set(framebuffer, f, FRAMEBUFFER|VIEWPORT);
+	set(framebuffer, f, FRAMEBUFFER);
 }
 
 void PipelineState::set_viewport(const Rect *v)
@@ -85,24 +37,17 @@ void PipelineState::set_shader_program(const Program *p)
 	set(shprog, p, SHPROG);
 }
 
-void PipelineState::set_vertex_setup(const VertexSetup *s)
-{
-	set(vertex_setup, s, VERTEX_SETUP);
-}
-
-void PipelineState::set_front_face(FaceWinding w)
-{
-	set(front_face, w, FACE_CULL);
-}
-
-void PipelineState::set_face_cull(CullMode c)
+void PipelineState::set_uniform_block(int binding, const UniformBlock *block)
 {
-	set(face_cull, c, FACE_CULL);
-}
-
-void PipelineState::set_enabled_clip_planes(unsigned p)
-{
-	set(enabled_clip_planes, p, CLIP_PLANES);
+	auto i = lower_bound_member(uniform_blocks, binding, &BoundUniformBlock::binding);
+	if(i==uniform_blocks.end() || i->binding!=binding)
+		i = uniform_blocks.insert(i, BoundUniformBlock(binding));
+	if(block!=i->block || binding<0)
+	{
+		i->block = block;
+		i->changed = true;
+		changes |= UNIFORMS;
+	}
 }
 
 void PipelineState::set_texture(unsigned binding, const Texture *tex, const Sampler *samp)
@@ -110,7 +55,7 @@ void PipelineState::set_texture(unsigned binding, const Texture *tex, const Samp
 	if((tex!=0)!=(samp!=0))
 		throw invalid_argument("PipelineState::set_texture");
 
-	vector<BoundTexture>::iterator i = lower_bound_member(textures, binding, &BoundTexture::binding);
+	auto i = lower_bound_member(textures, binding, &BoundTexture::binding);
 	if(i==textures.end() || i->binding!=binding)
 		i = textures.insert(i, BoundTexture(binding));
 	if(tex!=i->texture || samp!=i->sampler)
@@ -122,27 +67,19 @@ void PipelineState::set_texture(unsigned binding, const Texture *tex, const Samp
 	}
 }
 
-void PipelineState::set_uniforms(const DefaultUniformBlock *block)
+void PipelineState::set_vertex_setup(const VertexSetup *s)
 {
-	set_uniform_block_(-1, block);
+	set(vertex_setup, s, VERTEX_SETUP);
 }
 
-void PipelineState::set_uniform_block(unsigned binding, const BufferBackedUniformBlock *block)
+void PipelineState::set_front_face(FaceWinding w)
 {
-	set_uniform_block_(binding, block);
+	set(front_face, w, FACE_CULL);
 }
 
-void PipelineState::set_uniform_block_(int binding, const UniformBlock *block)
+void PipelineState::set_face_cull(CullMode c)
 {
-	vector<BoundUniformBlock>::iterator i = lower_bound_member(uniform_blocks, binding, &BoundUniformBlock::binding);
-	if(i==uniform_blocks.end() || i->binding!=binding)
-		i = uniform_blocks.insert(i, BoundUniformBlock(binding));
-	if(block!=i->block || binding<0)
-	{
-		i->block = block;
-		i->changed = true;
-		changes |= UNIFORMS;
-	}
+	set(face_cull, c, FACE_CULL);
 }
 
 void PipelineState::set_depth_test(const DepthTest *dt)
@@ -160,220 +97,6 @@ void PipelineState::set_blend(const Blend *b)
 	set(blend, b, BLEND);
 }
 
-void PipelineState::apply() const
-{
-	apply(this==last_applied ? changes : ~0U);
-}
-
-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);
-
-	if(mask&VERTEX_SETUP)
-	{
-		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 && front_face!=NON_MANIFOLD)
-		{
-			glEnable(GL_CULL_FACE);
-			glCullFace(face_cull==CULL_FRONT ? GL_FRONT : GL_BACK);
-		}
-		else
-			glDisable(GL_CULL_FACE);
-	}
-
-	if(mask&CLIP_PLANES)
-	{
-		unsigned max_clip_planes = Limits::get_global().max_clip_planes;
-		for(unsigned i=0; i<max_clip_planes; ++i)
-		{
-			if((enabled_clip_planes>>i)&1)
-				glEnable(GL_CLIP_PLANE0+i);
-			else
-				glDisable(GL_CLIP_PLANE0+i);
-		}
-	}
-
-	if(mask&TEXTURES)
-	{
-		for(vector<BoundTexture>::const_iterator i=textures.begin(); i!=textures.end(); ++i)
-			if(i->changed || mask==~0U)
-			{
-				if(i->texture && i->sampler)
-				{
-					if(ARB_direct_state_access)
-						glBindTextureUnit(i->binding, i->texture->get_id());
-					else
-					{
-						glActiveTexture(GL_TEXTURE0+i->binding);
-						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();
-
-					glBindSampler(i->binding, i->sampler->get_id());
-					i->sampler->refresh();
-				}
-
-				i->changed = false;
-			}
-	}
-
-	if(mask&UNIFORMS)
-	{
-		for(vector<BoundUniformBlock>::const_iterator i=uniform_blocks.begin(); i!=uniform_blocks.end(); ++i)
-			if(i->changed || mask==~0U)
-			{
-				if(i->block)
-				{
-					if(i->binding>=0)
-					{
-						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();
-				}
-
-				i->changed = false;
-			}
-	}
-
-	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;
-}
-
-void PipelineState::clear()
-{
-	if(last_applied)
-	{
-		glUseProgram(0);
-		glBindVertexArray(0);
-
-		unsigned max_clip_planes = Limits::get_global().max_clip_planes;
-		for(unsigned i=0; i<max_clip_planes; ++i)
-			if((last_applied->enabled_clip_planes>>i)&1)
-				glDisable(GL_CLIP_PLANE0+i);
-
-		for(unsigned i=0; i<bound_tex_targets.size(); ++i)
-			if(bound_tex_targets[i])
-			{
-				if(ARB_direct_state_access)
-					glBindTextureUnit(i, 0);
-				else
-				{
-					glActiveTexture(GL_TEXTURE0+i);
-					glBindTexture(bound_tex_targets[i], 0);
-				}
-				bound_tex_targets[i] = 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);
-		glDisable(GL_STENCIL_TEST);
-		glDisable(GL_BLEND);
-
-		last_applied = 0;
-	}
-}
-
 
 PipelineState::BoundTexture::BoundTexture(unsigned b):
 	binding(b),