mewin/glm
1
0
Fork 0
Code Releases Activity

Limited extended integer type redifinition (#233)

Browse Source
This commit is contained in:
Christophe Riccio 2014-09-07 01:17:20 +02:00
parent bfa893b957
commit 0613b5c0f1
2 changed files with 333 additions and 329 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
glm/fwd.hpp
View File

@ -938,7 +938,6 @@ namespace glm
/// Low precision 8 bit unsigned integer scalar type. /// Low precision 8 bit unsigned integer scalar type.
/// @see gtc_type_precision /// @see gtc_type_precision
typedef detail::tvec1<u8, lowp> lowp_u8vec1; typedef detail::tvec1<u8, lowp> lowp_u8vec1;
@ -1575,7 +1574,6 @@ namespace glm
typedef detail::tvec4<float, lowp> lowp_fvec4; typedef detail::tvec4<float, lowp> lowp_fvec4;
/// Medium single-precision floating-point vector of 1 component. /// Medium single-precision floating-point vector of 1 component.
/// @see gtc_type_precision /// @see gtc_type_precision
typedef detail::tvec1<float, mediump> mediump_vec1; typedef detail::tvec1<float, mediump> mediump_vec1;
@ -1609,7 +1607,6 @@ namespace glm
typedef detail::tvec4<float, mediump> mediump_fvec4; typedef detail::tvec4<float, mediump> mediump_fvec4;
/// High single-precision floating-point vector of 1 component. /// High single-precision floating-point vector of 1 component.
/// @see gtc_type_precision /// @see gtc_type_precision
typedef detail::tvec1<float, highp> highp_vec1; typedef detail::tvec1<float, highp> highp_vec1;
@ -1858,7 +1855,6 @@ namespace glm
typedef mediump_fmat4x4 mediump_fmat4; typedef mediump_fmat4x4 mediump_fmat4;
/// High single-precision floating-point 1x1 matrix. /// High single-precision floating-point 1x1 matrix.
/// @see gtc_type_precision /// @see gtc_type_precision
//typedef highp_f32 highp_fmat1x1; //typedef highp_f32 highp_fmat1x1;
@ -1973,7 +1969,6 @@ namespace glm
typedef lowp_f32mat4x4 lowp_f32mat4; typedef lowp_f32mat4x4 lowp_f32mat4;
/// High single-precision floating-point 1x1 matrix. /// High single-precision floating-point 1x1 matrix.
/// @see gtc_type_precision /// @see gtc_type_precision
//typedef f32 mediump_f32mat1x1; //typedef f32 mediump_f32mat1x1;
@ -2031,8 +2026,6 @@ namespace glm
typedef mediump_f32mat4x4 mediump_f32mat4; typedef mediump_f32mat4x4 mediump_f32mat4;
/// High single-precision floating-point 1x1 matrix. /// High single-precision floating-point 1x1 matrix.
/// @see gtc_type_precision /// @see gtc_type_precision
//typedef f32 highp_f32mat1x1; //typedef f32 highp_f32mat1x1;
@ -2090,7 +2083,6 @@ namespace glm
typedef highp_f32mat4x4 highp_f32mat4; typedef highp_f32mat4x4 highp_f32mat4;
/// Low double-precision floating-point 1x1 matrix. /// Low double-precision floating-point 1x1 matrix.
/// @see gtc_type_precision /// @see gtc_type_precision
//typedef f64 lowp_f64mat1x1; //typedef f64 lowp_f64mat1x1;
@ -2148,7 +2140,6 @@ namespace glm
typedef lowp_f64mat4x4 lowp_f64mat4; typedef lowp_f64mat4x4 lowp_f64mat4;
/// Medium double-precision floating-point 1x1 matrix. /// Medium double-precision floating-point 1x1 matrix.
/// @see gtc_type_precision /// @see gtc_type_precision
//typedef f64 Highp_f64mat1x1; //typedef f64 Highp_f64mat1x1;
@ -2501,7 +2492,6 @@ namespace glm
typedef highp_f32quat f32quat; typedef highp_f32quat f32quat;
#endif #endif
#if(defined(GLM_PRECISION_LOWP_DOUBLE)) #if(defined(GLM_PRECISION_LOWP_DOUBLE))
typedef lowp_f64vec1 f64vec1; typedef lowp_f64vec1 f64vec1;
typedef lowp_f64vec2 f64vec2; typedef lowp_f64vec2 f64vec2;

14
glm/gtc/type_precision.hpp
View File

@ -230,6 +230,12 @@ namespace glm
/// @see gtc_type_precision /// @see gtc_type_precision
typedef detail::int64 int64; typedef detail::int64 int64;
#if GLM_HAS_EXTENDED_INTEGER_TYPE
using std::int8_t;
using std::int16_t;
using std::int32_t;
using std::int64_t;
#else
/// 8 bit signed integer type. /// 8 bit signed integer type.
/// @see gtc_type_precision /// @see gtc_type_precision
typedef detail::int8 int8_t; typedef detail::int8 int8_t;
@ -245,6 +251,7 @@ namespace glm
/// 64 bit signed integer type. /// 64 bit signed integer type.
/// @see gtc_type_precision /// @see gtc_type_precision
typedef detail::int64 int64_t; typedef detail::int64 int64_t;
#endif
/// 8 bit signed integer type. /// 8 bit signed integer type.
/// @see gtc_type_precision /// @see gtc_type_precision
@ -494,6 +501,12 @@ namespace glm
/// @see gtc_type_precision /// @see gtc_type_precision
typedef detail::uint64 uint64; typedef detail::uint64 uint64;
#if GLM_HAS_EXTENDED_INTEGER_TYPE
using std::uint8_t;
using std::uint16_t;
using std::uint32_t;
using std::uint64_t;
#else
/// Default precision 8 bit unsigned integer type. /// Default precision 8 bit unsigned integer type.
/// @see gtc_type_precision /// @see gtc_type_precision
typedef detail::uint8 uint8_t; typedef detail::uint8 uint8_t;
@ -509,6 +522,7 @@ namespace glm
/// Default precision 64 bit unsigned integer type. /// Default precision 64 bit unsigned integer type.
/// @see gtc_type_precision /// @see gtc_type_precision
typedef detail::uint64 uint64_t; typedef detail::uint64 uint64_t;
#endif
/// Default precision 8 bit unsigned integer type. /// Default precision 8 bit unsigned integer type.
/// @see gtc_type_precision /// @see gtc_type_precision