Refactor the internal interface of Bufferable a bit

[libs/gl.git] / source / batch.cpp

diff --git a/source/batch.cpp b/source/batch.cpp
index 7f9adff7aad42ca8a9cb8e3bd4758ff2048acb75..1b0c47bf976dd212aa4270a962d7f98a40f34761 100644 (file)
--- a/source/batch.cpp
+++ b/source/batch.cpp
@@ -196,11 +196,6 @@ void Batch::append_index(unsigned i)
                data.push_back(i);
 }
 
-void Batch::upload_data() const
-{
-       get_buffer()->sub_data(get_offset(), data.size(), &data[0]);
-}
-
 unsigned Batch::get_index_size() const
 {
        if(data_type==UNSIGNED_SHORT)
@@ -246,10 +241,10 @@ void Batch::draw() const
                restart_index = 0;
        }
 
-       if(Buffer *ibuf = get_buffer())
+       Buffer *ibuf = get_buffer();
+       BindRestore _bind_ibuf(ibuf, ELEMENT_ARRAY_BUFFER);
+       if(ibuf)
        {
-               BindRestore _bind_ibuf(ibuf, ELEMENT_ARRAY_BUFFER);
-
                if(dirty)
                        update_buffer();