Store default-block uniform data in a memory block

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

diff --git a/source/core/uniformblock.cpp b/source/core/uniformblock.cpp
index cc8945cf2093358d7df19ccebfe5e92ee9fffa61..f713bd2af5d320541b27f114b9a4cad719528231 100644 (file)
--- a/source/core/uniformblock.cpp
+++ b/source/core/uniformblock.cpp
@@ -1,90 +1,41 @@
-#include <stdexcept>
 #include <msp/gl/extensions/arb_shader_objects.h>
 #include <msp/gl/extensions/arb_uniform_buffer_object.h>
 #include "buffer.h"
 #include "color.h"
+#include "deviceinfo.h"
 #include "error.h"
 #include "matrix.h"
 #include "uniform.h"
 #include "uniformblock.h"
 #include "vector.h"
 
-using namespace std;
-
 namespace Msp {
 namespace GL {
 
-UniformBlock::UniformBlock():
-       size(0),
-       buf_range(0)
+UniformBlock::UniformBlock(const ReflectData::UniformBlockInfo &info):
+       data(info.data_size)
 {
        static Require _req(ARB_shader_objects);
-}
-
-UniformBlock::UniformBlock(unsigned s):
-       size(s),
-       buf_range(0)
-{
-       static Require _req(ARB_uniform_buffer_object);
-
-       if(!size)
-               throw invalid_argument("UniformBlock::UniformBlock");
-       data.resize(size);
-}
-
-UniformBlock::~UniformBlock()
-{
-       delete buf_range;
+       if(info.bind_point>=0)
+               static Require _req2(ARB_uniform_buffer_object);
 }
 
 unsigned UniformBlock::get_alignment() const
 {
-       return BufferRange::get_uniform_buffer_alignment();
-}
-
-void UniformBlock::location_changed(Buffer *buf, unsigned off, unsigned) const
-{
-       delete buf_range;
-       buf_range = new BufferRange(*buf, off, size);
+       return Limits::get_global().uniform_buffer_alignment;
 }
 
-void UniformBlock::attach(int index, const Uniform &uni)
+void UniformBlock::store(const ReflectData::UniformInfo &info, const Uniform &uni)
 {
-       if(size)
-               throw invalid_operation("UniformBlock::attach");
-
-       uniforms[index] = &uni;
-}
-
-void UniformBlock::attach(const Program::UniformInfo &info, const Uniform &uni)
-{
-       if(size)
-       {
-               uni.store(info, &data[info.location]);
-               dirty = true;
-       }
-       else
-               uniforms[info.location] = &uni;
-}
-
-void UniformBlock::apply(int index) const
-{
-       if((index>=0) != (size>0))
-               throw invalid_operation("UniformBlock::apply");
-
-       if(size)
+       if(info.block->bind_point<0)
        {
-               if(!get_buffer())
-                       throw invalid_operation("UniformBlock::apply");
-
-               refresh();
-               buf_range->bind_to(UNIFORM_BUFFER, index);
+               if(info.location<0)
+                       return;
+               uni.store(info, &data[info.location*16]);
        }
        else
-       {
-               for(map<int, const Uniform *>::const_iterator i=uniforms.begin(); i!=uniforms.end(); ++i)
-                       i->second->apply(i->first);
-       }
+               uni.store(info, &data[info.offset]);
+       dirty = true;
 }
 
 } // namespace GL