Refactor ProgramData buffer (re)creation into a function

diff --git a/source/render/programdata.cpp b/source/render/programdata.cpp
index f6ad56aee13b6dc0ed740180c24e1a4b32dc57e8..0aebdcd9a5747aa9f823ceb2a5116e3e45182560 100644 (file)
--- a/source/render/programdata.cpp
+++ b/source/render/programdata.cpp
@@ -502,6 +502,21 @@ vector<ProgramData::ProgramBlock>::iterator ProgramData::get_program(const Progr
        return programs.begin()+index;
 }
 
+void ProgramData::recreate_buffer() const
+{
+       Buffer *old_buffer = buffer;
+       // Create the new buffer first to ensure it has a different address
+       buffer = new Buffer;
+       delete old_buffer;
+       if(last_buffer_block)
+               last_buffer_block->change_buffer(buffer);
+
+#ifdef DEBUG
+       if(!debug_name.empty())
+               buffer->set_debug_name(debug_name);
+#endif
+}
+
 void ProgramData::update_block_uniform_indices(SharedBlock &block, const ReflectData::UniformBlockInfo &info) const
 {
        uint8_t *indices = block.indices.values;
@@ -551,14 +566,7 @@ void ProgramData::update_block_uniform_indices(SharedBlock &block, const Reflect
                if(info.bind_point>=0)
                {
                        if(!buffer)
-                       {
-                               buffer = new Buffer();
-
-#ifdef DEBUG
-                               if(!debug_name.empty())
-                                       buffer->set_debug_name(debug_name);
-#endif
-                       }
+                               recreate_buffer();
 
                        block.block->use_buffer(buffer, last_buffer_block);
                        last_buffer_block = block.block;
@@ -645,16 +653,7 @@ vector<ProgramData::ProgramBlock>::const_iterator ProgramData::prepare_program(c
                        if(last_buffer_block->get_required_buffer_size()>buffer->get_size())
                        {
                                if(buffer->get_size()>0)
-                               {
-                                       delete buffer;
-                                       buffer = new Buffer();
-                                       last_buffer_block->change_buffer(buffer);
-
-#ifdef DEBUG
-                                       if(!debug_name.empty())
-                                               buffer->set_debug_name(debug_name);
-#endif
-                               }
+                                       recreate_buffer();
 
                                buffer->storage(required_size, STREAMING);
                        }

diff --git a/source/render/programdata.h b/source/render/programdata.h
index 5d674a38a2504f8360d338f5ac74b85f3545689e..ac7a36ac8166eeeb7f3f7edea0a7f2c009ec8a50 100644 (file)
--- a/source/render/programdata.h
+++ b/source/render/programdata.h
@@ -251,6 +251,7 @@ public:
 private:
        int find_uniform_index(Tag) const;
        std::vector<ProgramBlock>::iterator get_program(const Program &) const;
+       void recreate_buffer() const;
        void update_block_uniform_indices(SharedBlock &, const ReflectData::UniformBlockInfo &) const;
        void update_block(SharedBlock &, const ReflectData::UniformBlockInfo &) const;