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 d99bb95e24e53a2878143c949f5113fdfca980a5..56c25efb592e990e7438eae5932c53b4b9af7b72 100644 (file)
--- a/source/core/batch.cpp
+++ b/source/core/batch.cpp
@@ -1,16 +1,12 @@
-#include <msp/gl/extensions/msp_primitive_restart.h>
 #include "batch.h"
-#include "buffer.h"
 #include "error.h"
-#include "mesh.h"
-#include "vertexarray.h"
 
 using namespace std;
 
 namespace {
 
 template<typename T>
-void append(vector<Msp::UInt8> &data, T i)
+void append(vector<uint8_t> &data, T i)
 {
        data.insert(data.end(), sizeof(T), 0);
        *(T *)(&data[data.size()-sizeof(T)]) = i;
@@ -26,7 +22,7 @@ U convert(T n)
 }
 
 template<typename T, typename U>
-void expand(vector<Msp::UInt8> &data)
+void expand(vector<uint8_t> &data)
 {
        unsigned count = data.size()/sizeof(T);
        data.resize(count*sizeof(U));
@@ -35,7 +31,7 @@ void expand(vector<Msp::UInt8> &data)
 }
 
 template<typename T, typename U>
-void shrink(vector<Msp::UInt8> &data)
+void shrink(vector<uint8_t> &data)
 {
        unsigned count = data.size()/sizeof(T);
        for(unsigned i=0; i<count; ++i)
@@ -49,15 +45,11 @@ namespace Msp {
 namespace GL {
 
 Batch::Batch(PrimitiveType t):
+       BatchBackend(t),
        prim_type(t),
-       gl_prim_type(GL::get_gl_primitive_type(prim_type)),
-       index_type(UNSIGNED_SHORT),
-       gl_index_type(get_gl_type(index_type)),
-       max_index(0)
-{ }
-
-Batch::~Batch()
+       index_type(VOID)
 {
+       set_index_type(UNSIGNED_SHORT);
 }
 
 void Batch::set_index_type(DataType t)
@@ -70,14 +62,24 @@ void Batch::set_index_type(DataType t)
                throw invalid_operation("Batch::set_data_type");
 
        if(index_type==UNSIGNED_SHORT && t==UNSIGNED_INT)
-               expand<UInt16, UInt32>(data);
+               expand<uint16_t, uint32_t>(data);
        else if(index_type==UNSIGNED_INT && t==UNSIGNED_SHORT)
-               shrink<UInt32, UInt16>(data);
+               shrink<uint32_t, uint16_t>(data);
 
        index_type = t;
-       gl_index_type = get_gl_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)
@@ -85,7 +87,7 @@ Batch &Batch::append(unsigned i)
        append_index(i);
 
        update_offset();
-       dirty = true;
+       mark_dirty();
 
        return *this;
 }
@@ -100,7 +102,7 @@ Batch &Batch::append(const vector<unsigned> &ind)
                append_index(i);
 
        update_offset();
-       dirty = true;
+       mark_dirty();
 
        return *this;
 }
@@ -109,8 +111,8 @@ 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)
-               return MSP_primitive_restart;
+       else if(prim_type==LINE_STRIP || prim_type==TRIANGLE_FAN)
+               return check_restart(false);
        else
                return true;
 }
@@ -119,8 +121,8 @@ Batch &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)
-               static Require _req(MSP_primitive_restart);
+       if(prim_type==LINE_STRIP || prim_type==TRIANGLE_FAN)
+               check_restart(true);
 
        if(other.data.empty())
                return *this;
@@ -129,12 +131,12 @@ Batch &Batch::append(const Batch &other)
 
        if(prim_type==POINTS || prim_type==LINES || prim_type==TRIANGLES)
                ;
-       else if(MSP_primitive_restart)
+       else if(check_restart(false))
        {
                if(index_type==UNSIGNED_INT)
-                       ::append<UInt32>(data, 0xFFFFFFFF);
+                       ::append<uint32_t>(data, 0xFFFFFFFF);
                else
-                       ::append<UInt16>(data, 0xFFFF);
+                       ::append<uint16_t>(data, 0xFFFF);
        }
        else if(prim_type==TRIANGLE_STRIP)
        {
@@ -149,7 +151,7 @@ Batch &Batch::append(const Batch &other)
                append_index(other.get_index(i));
 
        update_offset();
-       dirty = true;
+       mark_dirty();
 
        return *this;
 }
@@ -165,22 +167,17 @@ void Batch::append_index(unsigned i)
                set_index_type(UNSIGNED_INT);
 
        if(index_type==UNSIGNED_INT)
-               ::append<UInt32>(data, i);
+               ::append<uint32_t>(data, i);
        else
-               ::append<UInt16>(data, i);
+               ::append<uint16_t>(data, i);
 }
 
-unsigned Batch::get_index_size() const
-{
-       return (index_type==UNSIGNED_INT ? sizeof(UInt32) : sizeof(UInt16));
-}
-
-unsigned Batch::get_index(unsigned i) const
+unsigned Batch::get_index(size_t i) const
 {
        if(index_type==UNSIGNED_INT)
-               return *(UInt32 *)&data[i*sizeof(UInt32)];
+               return *(uint32_t *)&data[i*sizeof(uint32_t)];
        else
-               return *(UInt16 *)&data[i*sizeof(UInt16)];
+               return *(uint16_t *)&data[i*sizeof(uint16_t)];
 }
 
 
@@ -188,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)
@@ -195,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