X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fopengl%2Fdatatype_backend.cpp;h=da97010fae0ccdb99cf4ac29ca6035f1cea1abd7;hb=857e0a3f684fba4810260697a78a769dff514f1f;hp=9fd986ee10102e6fd3f1c0ab79cb4ecc07f01c68;hpb=160e9eea29bd10034733d59507fa1bcca36be401;p=libs%2Fgl.git diff --git a/source/backends/opengl/datatype_backend.cpp b/source/backends/opengl/datatype_backend.cpp index 9fd986ee..da97010f 100644 --- a/source/backends/opengl/datatype_backend.cpp +++ b/source/backends/opengl/datatype_backend.cpp @@ -30,12 +30,15 @@ const MappedType type_map[] = { Msp::GL::FLOAT, GL_FLOAT }, { Msp::GL::DOUBLE, GL_DOUBLE }, { Msp::GL::BOOL, GL_BOOL }, + { Msp::GL::UINT_VEC2, GL_UNSIGNED_INT_VEC2 }, { Msp::GL::INT_VEC2, GL_INT_VEC2 }, { Msp::GL::FLOAT_VEC2, GL_FLOAT_VEC2 }, { Msp::GL::BOOL_VEC2, GL_BOOL_VEC2 }, + { Msp::GL::UINT_VEC3, GL_UNSIGNED_INT_VEC3 }, { Msp::GL::INT_VEC3, GL_INT_VEC3 }, { Msp::GL::FLOAT_VEC3, GL_FLOAT_VEC3 }, { Msp::GL::BOOL_VEC3, GL_BOOL_VEC3 }, + { Msp::GL::UINT_VEC4, GL_UNSIGNED_INT_VEC4 }, { Msp::GL::INT_VEC4, GL_INT_VEC4 }, { Msp::GL::FLOAT_VEC4, GL_FLOAT_VEC4 }, { Msp::GL::BOOL_VEC4, GL_BOOL_VEC4 }, @@ -91,7 +94,7 @@ namespace GL { unsigned get_gl_type(DataType type) { const MappedType *end = type_map+type_map_size; - const MappedType *ptr = lower_bound(type_map, end, type, type_compare); + const MappedType *ptr = std::lower_bound(type_map, end, type, type_compare); if(ptr==end || ptr->type!=type) throw invalid_argument("get_gl_type"); return ptr->gl_type;