Specify underlying type for format descriptor enums

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

diff --git a/source/core/vertexformat.cpp b/source/core/vertexformat.cpp
index 9bfca5d295ad9688303d575434999700a368240e..8e358acd2d0394992925f05b26acd632b4427845 100644 (file)
--- a/source/core/vertexformat.cpp
+++ b/source/core/vertexformat.cpp
@@ -38,8 +38,8 @@ VertexFormat VertexFormat::operator,(DataType t) const
                throw invalid_operation("VertexFormat::operator,");
 
        VertexFormat r = *this;
-       uint16_t &a = r.attributes[r.count-1];
-       a = make_typed_attribute(static_cast<VertexAttribute>(a), t);
+       VertexAttribute &a = r.attributes[r.count-1];
+       a = make_typed_attribute(a, t);
 
        return r;
 }
@@ -50,8 +50,8 @@ VertexFormat VertexFormat::operator,(unsigned i) const
                throw invalid_operation("VertexFormat::operator,");
 
        VertexFormat r = *this;
-       uint16_t &a = r.attributes[r.count-1];
-       a = make_indexed_attribute(static_cast<VertexAttribute>(a), i);
+       VertexAttribute &a = r.attributes[r.count-1];
+       a = make_indexed_attribute(a, i);
 
        return r;
 }
@@ -66,8 +66,8 @@ bool VertexFormat::operator==(const VertexFormat &other) const
 unsigned VertexFormat::stride() const
 {
        unsigned s = 0;
-       for(const uint16_t *i=begin(); i!=end(); ++i)
-               s += get_attribute_size(*i);
+       for(VertexAttribute a: *this)
+               s += get_attribute_size(a);
        return s;
 }
 
@@ -75,18 +75,18 @@ int VertexFormat::offset(VertexAttribute attr) const
 {
        unsigned sem = get_attribute_semantic(attr);
        unsigned offs = 0;
-       for(const uint16_t *i=begin(); i!=end(); ++i)
+       for(VertexAttribute a: *this)
        {
-               if(get_attribute_semantic(*i)==sem)
+               if(get_attribute_semantic(a)==sem)
                {
-                       if(get_attribute_source_type(*i)==get_attribute_source_type(attr) &&
-                               get_attribute_component_count(*i)>=get_attribute_component_count(attr))
+                       if(get_attribute_source_type(a)==get_attribute_source_type(attr) &&
+                               get_attribute_component_count(a)>=get_attribute_component_count(attr))
                                return offs;
                        else
                                return -1;
                }
                else
-                       offs += get_attribute_size(*i);
+                       offs += get_attribute_size(a);
        }
 
        return -1;
@@ -105,14 +105,14 @@ VertexAttribute make_typed_attribute(VertexAttribute attr, DataType type)
 
 VertexAttribute make_indexed_attribute(VertexAttribute attr, unsigned index)
 {
-       unsigned base = attr;
+       VertexAttribute base = attr;
        if(get_attribute_semantic(attr)==get_attribute_semantic(TEXCOORD1))
        {
                if(index>=4)
                        throw out_of_range("make_indexed_attribute");
        }
        else if(get_attribute_semantic(attr)==get_attribute_semantic(RAW_ATTRIB1))
-               base &= 0x3FF;
+               base = static_cast<VertexAttribute>(base&0x3FF);
        else if(get_attribute_semantic(attr)!=get_attribute_semantic(GENERIC1))
                throw invalid_argument("make_indexed_attribute");