Store default-block uniform data in a memory block

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

diff --git a/source/core/pipelinestate.cpp b/source/core/pipelinestate.cpp
index f855eed61e012c35d86775c32e5a8f1c6ce51a16..871336bb76b25b43b6928aa41b7384e7f0410f5b 100644 (file)
--- a/source/core/pipelinestate.cpp
+++ b/source/core/pipelinestate.cpp
@@ -14,6 +14,7 @@
 #include "pipelinestate.h"
 #include "program.h"
 #include "rect.h"
+#include "sampler.h"
 #include "stenciltest.h"
 #include "texture.h"
 #include "uniformblock.h"
@@ -110,7 +111,7 @@ void PipelineState::set_texture(unsigned binding, const Texture *tex, const Samp
        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)
@@ -122,19 +123,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<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)
@@ -162,6 +153,9 @@ void PipelineState::set_blend(const Blend *b)
 
 void PipelineState::apply() const
 {
+       if(!last_applied)
+               Texture::unbind_scratch();
+
        apply(this==last_applied ? changes : ~0U);
 }
 
@@ -169,7 +163,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();
@@ -197,11 +191,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);
@@ -245,50 +239,52 @@ void PipelineState::apply(unsigned mask) const
 
        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;
                        }
        }