X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fpipelinestate.cpp;h=8d59a31624eddc823e23cd7260ed444c4efc9129;hb=e1be82a4dfce8d90358c506f65be09da4dc9d5ec;hp=742b2ba94c2723ccb917c1f181c10889e9205b16;hpb=f1e31ee641f0cafdfe2015bff206b9ee2ad85abf;p=libs%2Fgl.git

diff --git a/source/core/pipelinestate.cpp b/source/core/pipelinestate.cpp
index 742b2ba9..8d59a316 100644
--- a/source/core/pipelinestate.cpp
+++ b/source/core/pipelinestate.cpp
@@ -1,6 +1,8 @@
 #include <stdexcept>
 #include <msp/core/algorithm.h>
+#include "error.h"
 #include "pipelinestate.h"
+#include "uniformblock.h"
 
 using namespace std;
 
@@ -8,7 +10,7 @@ namespace Msp {
 namespace GL {
 
 template<typename T>
-void PipelineState::set(T &target, T value, unsigned flag)
+void PipelineState::set(T &target, const T &value, unsigned flag)
 {
 	if(value!=target)
 	{
@@ -22,12 +24,12 @@ void PipelineState::set_framebuffer(const Framebuffer *f)
 	set(framebuffer, f, FRAMEBUFFER);
 }
 
-void PipelineState::set_viewport(const Rect *v)
+void PipelineState::set_viewport(const Rect &v)
 {
 	set(viewport, v, VIEWPORT);
 }
 
-void PipelineState::set_scissor(const Rect *s)
+void PipelineState::set_scissor(const Rect &s)
 {
 	set(scissor, s, SCISSOR);
 }
@@ -42,27 +44,39 @@ void PipelineState::set_uniform_block(int binding, const UniformBlock *block)
 	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)
+	const Buffer *buffer = (block ? block->get_buffer() : 0);
+	if(block!=i->block || buffer!=i->buffer || binding<0)
 	{
 		i->block = block;
+		i->buffer = buffer;
 		i->changed = true;
+		i->used = block;
 		changes |= UNIFORMS;
 	}
 }
 
 void PipelineState::set_texture(unsigned binding, const Texture *tex, const Sampler *samp)
+{
+	set_texture(binding, tex, -1, samp);
+}
+
+void PipelineState::set_texture(unsigned binding, const Texture *tex, int level, const Sampler *samp)
 {
 	if((tex!=0)!=(samp!=0))
 		throw invalid_argument("PipelineState::set_texture");
+	if(level>=0 && !can_bind_tex_level(level))
+		throw invalid_operation("PipelineState::set_texture");
 
 	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)
+	if(tex!=i->texture || level!=i->level || samp!=i->sampler)
 	{
 		i->texture = tex;
 		i->sampler = samp;
+		i->level = level;
 		i->changed = true;
+		i->used = (tex && samp);
 		changes |= TEXTURES;
 	}
 }
@@ -87,35 +101,20 @@ void PipelineState::set_face_cull(CullMode c)
 	set(face_cull, c, FACE_CULL);
 }
 
-void PipelineState::set_depth_test(const DepthTest *dt)
+void PipelineState::set_depth_test(const DepthTest &dt)
 {
 	set(depth_test, dt, DEPTH_TEST);
 }
 
-void PipelineState::set_stencil_test(const StencilTest *st)
+void PipelineState::set_stencil_test(const StencilTest &st)
 {
 	set(stencil_test, st, STENCIL_TEST);
 }
 
-void PipelineState::set_blend(const Blend *b)
+void PipelineState::set_blend(const Blend &b)
 {
 	set(blend, b, BLEND);
 }
 
-
-PipelineState::BoundTexture::BoundTexture(unsigned b):
-	binding(b),
-	changed(false),
-	texture(0),
-	sampler(0)
-{ }
-
-
-PipelineState::BoundUniformBlock::BoundUniformBlock(int b):
-	binding(b),
-	changed(false),
-	block(0)
-{ }
-
 } // namespace GL
 } // namespace Msp