Check the flat qualifier from the correct member

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

diff --git a/source/core/batch.cpp b/source/core/batch.cpp
index 4fb2720df4cb9f2dcc27fa05de4f7bdc9fdd9597..56c25efb592e990e7438eae5932c53b4b9af7b72 100644 (file)
--- a/source/core/batch.cpp
+++ b/source/core/batch.cpp
@@ -47,8 +47,7 @@ namespace GL {
 Batch::Batch(PrimitiveType t):
        BatchBackend(t),
        prim_type(t),
-       index_type(VOID),
-       max_index(0)
+       index_type(VOID)
 {
        set_index_type(UNSIGNED_SHORT);
 }
@@ -70,7 +69,17 @@ void Batch::set_index_type(DataType t)
        index_type = t;
        BatchBackend::set_index_type(t);
        update_offset();
-       dirty = true;
+       mark_dirty();
+}
+
+void Batch::set_patch_size(unsigned s)
+{
+       if(prim_type!=PATCHES)
+               throw invalid_operation("Batch::set_patch_size");
+       if(s<1)
+               throw invalid_argument("Batch::set_patch_size");
+
+       patch_size = s;
 }
 
 Batch &Batch::append(unsigned i)
@@ -78,7 +87,7 @@ Batch &Batch::append(unsigned i)
        append_index(i);
 
        update_offset();
-       dirty = true;
+       mark_dirty();
 
        return *this;
 }
@@ -93,7 +102,7 @@ Batch &Batch::append(const vector<unsigned> &ind)
                append_index(i);
 
        update_offset();
-       dirty = true;
+       mark_dirty();
 
        return *this;
 }
@@ -142,7 +151,7 @@ Batch &Batch::append(const Batch &other)
                append_index(other.get_index(i));
 
        update_offset();
-       dirty = true;
+       mark_dirty();
 
        return *this;
 }
@@ -176,6 +185,7 @@ Batch::Loader::Loader(Batch &b):
        DataFile::ObjectLoader<Batch>(b)
 {
        add("indices", &Loader::indices);
+       add("patch_size", &Loader::patch_size);
 }
 
 void Batch::Loader::indices(const vector<unsigned> &ind)
@@ -183,5 +193,10 @@ void Batch::Loader::indices(const vector<unsigned> &ind)
        obj.append(ind);
 }
 
+void Batch::Loader::patch_size(unsigned s)
+{
+       obj.set_patch_size(s);
+}
+
 } // namespace GL
 } // namespace Msp