Correctly set framebuffer layers when cube map attachments are used

[libs/gl.git] / source / core / pipelinestate.cpp

diff --git a/source/core/pipelinestate.cpp b/source/core/pipelinestate.cpp
index 742b2ba94c2723ccb917c1f181c10889e9205b16..210a0703868035dc69572fc56cc50eaf67b9ff08 100644 (file)
--- a/source/core/pipelinestate.cpp
+++ b/source/core/pipelinestate.cpp
@@ -1,5 +1,6 @@
 #include <stdexcept>
 #include <msp/core/algorithm.h>
+#include "error.h"
 #include "pipelinestate.h"
 
 using namespace std;
@@ -42,6 +43,7 @@ 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));
+       i->used = block;
        if(block!=i->block || binding<0)
        {
                i->block = block;
@@ -51,17 +53,26 @@ void PipelineState::set_uniform_block(int binding, const UniformBlock *block)
 }
 
 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)
+       i->used = (tex && samp);
+       if(tex!=i->texture || level!=i->level || samp!=i->sampler)
        {
                i->texture = tex;
                i->sampler = samp;
+               i->level = level;
                i->changed = true;
                changes |= TEXTURES;
        }
@@ -102,20 +113,5 @@ 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