#include <msp/core/algorithm.h>
#include "error.h"
#include "pipelinestate.h"
+#include "uniformblock.h"
using namespace std;
if(i==uniform_blocks.end() || i->binding!=binding)
i = uniform_blocks.insert(i, BoundUniformBlock(binding));
i->used = block;
- 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;
changes |= UNIFORMS;
}