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)
{
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);
}
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));
+ auto i = lower_bound_member(resources, binding, &BoundResource::binding);
+ if(i==resources.end() || i->binding!=binding)
+ i = resources.insert(i, BoundResource(binding));
+
+ ResourceType type = (block ? UNIFORM_BLOCK : NO_RESOURCE);
const Buffer *buffer = (block ? block->get_buffer() : 0);
- if(block!=i->block || buffer!=i->buffer || binding<0)
+ if(i->type!=type || block!=i->block || buffer!=i->buffer || binding<0)
{
+ i->type = type;
i->block = block;
i->buffer = buffer;
i->changed = true;
i->used = block;
- changes |= UNIFORMS;
+ changes |= RESOURCES;
}
}
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 || level!=i->level || samp!=i->sampler)
+ set_texture_resource(binding, tex, level, samp);
+}
+
+void PipelineState::set_storage_texture(unsigned binding, const Texture *tex)
+{
+ set_texture_resource(binding, tex, 0, 0);
+}
+
+void PipelineState::set_texture_resource(unsigned binding, const Texture *tex, int level, const Sampler *samp)
+{
+ auto i = lower_bound_member(resources, static_cast<int>(binding), &BoundResource::binding);
+ if(i==resources.end() || i->binding!=static_cast<int>(binding))
+ i = resources.insert(i, BoundResource(binding));
+
+ ResourceType type = (tex ? samp ? SAMPLED_TEXTURE : STORAGE_TEXTURE : NO_RESOURCE);
+ if(i->type!=type || tex!=i->texture || level!=i->mip_level || samp!=i->sampler)
{
+ i->type = type;
i->texture = tex;
i->sampler = samp;
- i->level = level;
+ i->mip_level = level;
i->changed = true;
- i->used = (tex && samp);
- changes |= TEXTURES;
+ i->used = tex;
+ changes |= RESOURCES;
}
}
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);
}