@@ -629,7 +629,9 @@ VertexStreamBase VertexDeclaration::GetStream(int index) const | |||||
case VertexStreamBase::Type##T: stream.AddStream<T>(n++, m_streams[i].usage); break; | case VertexStreamBase::Type##T: stream.AddStream<T>(n++, m_streams[i].usage); break; | ||||
__T(void) | __T(void) | ||||
#if LOL_FEATURE_CXX11_UNRESTRICTED_UNIONS | |||||
__T(half) __T(f16vec2) __T(f16vec3) __T(f16vec4) | __T(half) __T(f16vec2) __T(f16vec3) __T(f16vec4) | ||||
#endif | |||||
__T(float) __T(vec2) __T(vec3) __T(vec4) | __T(float) __T(vec2) __T(vec3) __T(vec4) | ||||
__T(double) __T(dvec2) __T(dvec3) __T(dvec4) | __T(double) __T(dvec2) __T(dvec3) __T(dvec4) | ||||
__T(int8_t) __T(i8vec2) __T(i8vec3) __T(i8vec4) | __T(int8_t) __T(i8vec2) __T(i8vec3) __T(i8vec4) | ||||
@@ -56,7 +56,9 @@ public: | |||||
enum | enum | ||||
{ | { | ||||
Typevoid = 0, | Typevoid = 0, | ||||
#if LOL_FEATURE_CXX11_UNRESTRICTED_UNIONS | |||||
Typehalf, Typef16vec2, Typef16vec3, Typef16vec4, | Typehalf, Typef16vec2, Typef16vec3, Typef16vec4, | ||||
#endif | |||||
Typefloat, Typevec2, Typevec3, Typevec4, | Typefloat, Typevec2, Typevec3, Typevec4, | ||||
Typedouble, Typedvec2, Typedvec3, Typedvec4, | Typedouble, Typedvec2, Typedvec3, Typedvec4, | ||||
Typeint8_t, Typei8vec2, Typei8vec3, Typei8vec4, | Typeint8_t, Typei8vec2, Typei8vec3, Typei8vec4, | ||||
@@ -103,7 +105,9 @@ protected: | |||||
static uint8_t GetType(T *x) { UNUSED(x); return Type##T; } | static uint8_t GetType(T *x) { UNUSED(x); return Type##T; } | ||||
__T(void) | __T(void) | ||||
#if LOL_FEATURE_CXX11_UNRESTRICTED_UNIONS | |||||
__T(half) __T(f16vec2) __T(f16vec3) __T(f16vec4) | __T(half) __T(f16vec2) __T(f16vec3) __T(f16vec4) | ||||
#endif | |||||
__T(float) __T(vec2) __T(vec3) __T(vec4) | __T(float) __T(vec2) __T(vec3) __T(vec4) | ||||
__T(double) __T(dvec2) __T(dvec3) __T(dvec4) | __T(double) __T(dvec2) __T(dvec3) __T(dvec4) | ||||
__T(int8_t) __T(i8vec2) __T(i8vec3) __T(i8vec4) | __T(int8_t) __T(i8vec2) __T(i8vec3) __T(i8vec4) | ||||
@@ -56,11 +56,15 @@ namespace lol { | |||||
\ | \ | ||||
LOL_MAT_CONST(T, identity, 1) | LOL_MAT_CONST(T, identity, 1) | ||||
#if LOL_FEATURE_CXX11_UNRESTRICTED_UNIONS | |||||
LOL_ALL_CONST_INNER(half) | LOL_ALL_CONST_INNER(half) | ||||
#endif | |||||
LOL_ALL_CONST_INNER(float) | LOL_ALL_CONST_INNER(float) | ||||
LOL_ALL_CONST_INNER(double) | LOL_ALL_CONST_INNER(double) | ||||
LOL_ALL_CONST_INNER(ldouble) | LOL_ALL_CONST_INNER(ldouble) | ||||
#if LOL_FEATURE_CXX11_UNRESTRICTED_UNIONS | |||||
LOL_ALL_CONST_INNER(real) | LOL_ALL_CONST_INNER(real) | ||||
#endif | |||||
LOL_ALL_CONST_INNER(int8_t) | LOL_ALL_CONST_INNER(int8_t) | ||||
LOL_ALL_CONST_INNER(uint8_t) | LOL_ALL_CONST_INNER(uint8_t) | ||||