Fix reflection of image types from Spir-V modules

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

diff --git a/source/core/batch.cpp b/source/core/batch.cpp
index fa28e9564d569267b322f8fead7a0761258b8045..382cfbdb5df1ab6526df9e6c6c96e0004d620612 100644 (file)
--- a/source/core/batch.cpp
+++ b/source/core/batch.cpp
@@ -53,10 +53,6 @@ Batch::Batch(PrimitiveType t):
        set_index_type(UNSIGNED_SHORT);
 }
 
-Batch::~Batch()
-{
-}
-
 void Batch::set_index_type(DataType t)
 {
        if(t==index_type)
@@ -106,7 +102,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)
+       else if(prim_type==LINE_STRIP || prim_type==TRIANGLE_FAN)
                return check_restart(false);
        else
                return true;
@@ -116,7 +112,7 @@ 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)
+       if(prim_type==LINE_STRIP || prim_type==TRIANGLE_FAN)
                check_restart(true);
 
        if(other.data.empty())
@@ -167,12 +163,12 @@ void Batch::append_index(unsigned i)
                ::append<uint16_t>(data, i);
 }
 
-unsigned Batch::get_index_size() const
+size_t Batch::get_index_size() const
 {
        return (index_type==UNSIGNED_INT ? sizeof(uint32_t) : sizeof(uint16_t));
 }
 
-unsigned Batch::get_index(unsigned i) const
+unsigned Batch::get_index(size_t i) const
 {
        if(index_type==UNSIGNED_INT)
                return *(uint32_t *)&data[i*sizeof(uint32_t)];