X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fpipelinestate.cpp;h=97f353dcee8b572c835e1ac5569ca9769489b246;hb=009918e76dda88b0cb68fdaa20c63d6e952af260;hp=318522d6563b547eebcf6b823ed3e5ddbb9c0305;hpb=7b569bbfcfb65d8d88b47ac42ee1df6a7d27e784;p=libs%2Fgl.git diff --git a/source/core/pipelinestate.cpp b/source/core/pipelinestate.cpp index 318522d6..97f353dc 100644 --- a/source/core/pipelinestate.cpp +++ b/source/core/pipelinestate.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include #include "blend.h" #include "buffer.h" @@ -14,6 +15,7 @@ #include "pipelinestate.h" #include "program.h" #include "rect.h" +#include "sampler.h" #include "stenciltest.h" #include "texture.h" #include "uniformblock.h" @@ -44,9 +46,9 @@ PipelineState::PipelineState(): changes(0) { if(bound_tex_targets.empty()) - bound_tex_targets.resize(Limits::get_global().max_texture_bindings); + bound_tex_targets.resize(DeviceInfo::get_global().limits.max_texture_bindings); if(bound_uniform_blocks.empty()) - bound_uniform_blocks.resize(Limits::get_global().max_uniform_bindings); + bound_uniform_blocks.resize(DeviceInfo::get_global().limits.max_uniform_bindings); } PipelineState::~PipelineState() @@ -110,7 +112,7 @@ void PipelineState::set_texture(unsigned binding, const Texture *tex, const Samp if((tex!=0)!=(samp!=0)) throw invalid_argument("PipelineState::set_texture"); - vector::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) @@ -122,19 +124,9 @@ void PipelineState::set_texture(unsigned binding, const Texture *tex, const Samp } } -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::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) @@ -172,7 +164,7 @@ void PipelineState::apply(unsigned mask) const { if(mask&FRAMEBUFFER) { - glBindFramebuffer(GL_FRAMEBUFFER, framebuffer ? framebuffer->get_id() : 0); + glBindFramebuffer(GL_FRAMEBUFFER, framebuffer ? framebuffer->id : 0); if(framebuffer) { framebuffer->refresh(); @@ -200,11 +192,11 @@ void PipelineState::apply(unsigned mask) const } 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); @@ -236,7 +228,7 @@ void PipelineState::apply(unsigned mask) const if(mask&CLIP_PLANES) { - unsigned max_clip_planes = Limits::get_global().max_clip_planes; + unsigned max_clip_planes = DeviceInfo::get_global().limits.max_clip_planes; for(unsigned i=0; i>i)&1) @@ -248,49 +240,52 @@ void PipelineState::apply(unsigned mask) const if(mask&TEXTURES) { - for(vector::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(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(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::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(i->block); - glBindBufferRange(GL_UNIFORM_BUFFER, i->binding, block->get_buffer()->get_id(), block->get_offset(), block->get_data_size()); - bound_uniform_blocks[i->binding] = 1; + 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(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(i->block)->apply(); } - i->changed = false; + u.changed = false; } } @@ -343,7 +338,7 @@ void PipelineState::clear() glUseProgram(0); glBindVertexArray(0); - unsigned max_clip_planes = Limits::get_global().max_clip_planes; + unsigned max_clip_planes = DeviceInfo::get_global().limits.max_clip_planes; for(unsigned i=0; ienabled_clip_planes>>i)&1) glDisable(GL_CLIP_PLANE0+i);