#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/ext_framebuffer_object.h>
#include <msp/gl/extensions/msp_primitive_restart.h>
#include "blend.h"
#include "buffer.h"
#include "pipelinestate.h"
#include "program.h"
#include "rect.h"
+#include "sampler.h"
#include "stenciltest.h"
#include "texture.h"
#include "uniformblock.h"
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)
}
}
-void PipelineState::set_uniforms(const DefaultUniformBlock *block)
+void PipelineState::set_uniform_block(int binding, const UniformBlock *block)
{
- set_uniform_block_(-1, block);
-}
-
-void PipelineState::set_uniform_block(unsigned binding, const BufferBackedUniformBlock *block)
-{
- set_uniform_block_(binding, block);
-}
-
-void PipelineState::set_uniform_block_(int binding, const UniformBlock *block)
-{
- vector<BoundUniformBlock>::iterator i = lower_bound_member(uniform_blocks, binding, &BoundUniformBlock::binding);
+ 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)
void PipelineState::apply() const
{
+ if(!last_applied)
+ Texture::unbind_scratch();
+
apply(this==last_applied ? changes : ~0U);
}
{
if(mask&FRAMEBUFFER)
{
- glBindFramebuffer(GL_FRAMEBUFFER, framebuffer ? framebuffer->get_id() : 0);
+ glBindFramebuffer(GL_FRAMEBUFFER, framebuffer ? framebuffer->id : 0);
if(framebuffer)
{
framebuffer->refresh();
}
if(mask&SHPROG)
- glUseProgram(shprog ? shprog->get_id() : 0);
+ glUseProgram(shprog ? shprog->id : 0);
if(mask&VERTEX_SETUP)
{
- glBindVertexArray(vertex_setup ? vertex_setup->get_id() : 0);
+ glBindVertexArray(vertex_setup ? vertex_setup->id : 0);
if(vertex_setup)
{
static Require _req(MSP_primitive_restart);
if(mask&TEXTURES)
{
- for(vector<BoundTexture>::const_iterator i=textures.begin(); i!=textures.end(); ++i)
- if(i->changed || mask==~0U)
+ for(const BoundTexture &t: textures)
+ if(t.changed || mask==~0U)
{
- if(i->texture && i->sampler)
+ if(t.texture && t.sampler)
{
if(ARB_direct_state_access)
- glBindTextureUnit(i->binding, i->texture->get_id());
+ glBindTextureUnit(t.binding, t.texture->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());
+ glActiveTexture(GL_TEXTURE0+t.binding);
+ if(bound_tex_targets[t.binding] && static_cast<int>(t.texture->target)!=bound_tex_targets[t.binding])
+ glBindTexture(bound_tex_targets[t.binding], 0);
+ glBindTexture(t.texture->target, t.texture->id);
}
- bound_tex_targets[i->binding] = i->texture->get_target();
+ bound_tex_targets[t.binding] = t.texture->target;
- glBindSampler(i->binding, i->sampler->get_id());
- i->sampler->refresh();
+ glBindSampler(t.binding, t.sampler->id);
+ t.sampler->refresh();
}
- i->changed = false;
+ t.changed = false;
}
}
if(mask&UNIFORMS)
{
- for(vector<BoundUniformBlock>::const_iterator i=uniform_blocks.begin(); i!=uniform_blocks.end(); ++i)
- if(i->changed || mask==~0U)
+ for(const BoundUniformBlock &u: uniform_blocks)
+ if(u.changed || mask==~0U)
{
- if(i->block)
+ if(u.block)
{
- if(i->binding>=0)
+ if(u.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());
+ glBindBufferRange(GL_UNIFORM_BUFFER, u.binding, u.block->get_buffer()->id, u.block->get_offset(), u.block->get_data_size());
+ bound_uniform_blocks[u.binding] = 1;
+ }
+ else if(shprog)
+ {
+ const char *data = static_cast<const char *>(u.block->get_data_pointer());
+ for(const Program::UniformCall &call: shprog->uniform_calls)
+ call.func(call.location, call.size, data+call.location*16);
}
- else
- static_cast<const DefaultUniformBlock *>(i->block)->apply();
-
- bound_uniform_blocks[i->binding] = 1;
}
- i->changed = false;
+ u.changed = false;
}
}