Remove a number of rarely used legacy features

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

diff --git a/source/batch.cpp b/source/batch.cpp
index 956fe1309e80ad0b65a714b2ac000b5162c05348..e097fd6365d52b65db4a8d37110ef0f3010a7ccf 100644 (file)
--- a/source/batch.cpp
+++ b/source/batch.cpp
@@ -4,6 +4,7 @@
 #include "bindable.h"
 #include "buffer.h"
 #include "error.h"
+#include "mesh.h"
 #include "vertexarray.h"
 
 using namespace std;
@@ -97,7 +98,7 @@ void Batch::set_data_type(DataType t)
 Batch &Batch::append(unsigned i)
 {
        append_index(i);
-       
+
        update_offset();
        dirty = true;
 
@@ -121,7 +122,7 @@ bool Batch::can_append(PrimitiveType other_type)
 {
        if(other_type!=prim_type)
                return false;
-       else if(prim_type==LINE_STRIP || prim_type==LINE_LOOP || prim_type==TRIANGLE_FAN || prim_type==POLYGON)
+       else if(prim_type==LINE_STRIP || prim_type==LINE_LOOP || prim_type==TRIANGLE_FAN)
                return NV_primitive_restart;
        else
                return true;
@@ -131,7 +132,7 @@ void Batch::append(const Batch &other)
 {
        if(other.prim_type!=prim_type)
                throw invalid_argument("Batch::append");
-       if(prim_type==LINE_STRIP || prim_type==LINE_LOOP || prim_type==TRIANGLE_FAN || prim_type==POLYGON)
+       if(prim_type==LINE_STRIP || prim_type==LINE_LOOP || prim_type==TRIANGLE_FAN)
                static Require _req(NV_primitive_restart);
 
        if(other.data.empty())
@@ -195,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)
@@ -245,14 +241,13 @@ void Batch::draw() const
                restart_index = 0;
        }
 
-       if(get_buffer())
+       Buffer *ibuf = get_buffer();
+       BindRestore _bind_ibuf(ibuf, ELEMENT_ARRAY_BUFFER);
+       if(ibuf)
        {
                if(dirty)
                        update_buffer();
 
-               BufferAlias<ELEMENT_ARRAY_BUFFER> alias(*get_buffer());
-               Bind bind_ibuf(alias, true);
-
                glDrawRangeElements(prim_type, min_index, max_index, size(), data_type, reinterpret_cast<void *>(get_offset()));
        }
        else