diff --git a/glm/ext.hpp b/glm/ext.hpp index 8074f5ec..b3d98a3b 100644 --- a/glm/ext.hpp +++ b/glm/ext.hpp @@ -112,7 +112,6 @@ #include "./gtx/normal.hpp" #include "./gtx/normalize_dot.hpp" #include "./gtx/number_precision.hpp" -#include "./gtx/ocl_type.hpp" #include "./gtx/optimum_pow.hpp" #include "./gtx/orthonormalize.hpp" #include "./gtx/perpendicular.hpp" diff --git a/glm/gtx/ocl_type.hpp b/glm/gtx/ocl_type.hpp deleted file mode 100644 index 7e8af095..00000000 --- a/glm/gtx/ocl_type.hpp +++ /dev/null @@ -1,132 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -/// OpenGL Mathematics (glm.g-truc.net) -/// -/// Copyright (c) 2005 - 2013 G-Truc Creation (www.g-truc.net) -/// Permission is hereby granted, free of charge, to any person obtaining a copy -/// of this software and associated documentation files (the "Software"), to deal -/// in the Software without restriction, including without limitation the rights -/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -/// copies of the Software, and to permit persons to whom the Software is -/// furnished to do so, subject to the following conditions: -/// -/// The above copyright notice and this permission notice shall be included in -/// all copies or substantial portions of the Software. -/// -/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -/// THE SOFTWARE. -/// -/// @ref gtx_ocl_type -/// @file glm/gtx/ocl_type.hpp -/// @date 2009-05-07 / 2011-06-07 -/// @author Christophe Riccio -/// -/// @see core (dependence) -/// @see gtx_extented_min_max (dependence) -/// -/// @defgroup gtx_ocl_type GLM_GTX_ocl_type -/// @ingroup gtx -/// -/// @brief OpenCL types. -/// -/// need to be included to use these functionalities. -/////////////////////////////////////////////////////////////////////////////////// - -#ifndef GLM_GTX_ocl_type -#define GLM_GTX_ocl_type GLM_VERSION - -// Dependency: -#include "../glm.hpp" - -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) -# pragma message("GLM: GLM_GTX_ocl_type extension included") -#endif - -namespace glm{ -namespace gtx -{ - /////////////////////////// - // Scalar types - - /// @addtogroup gtx_ocl_type - /// @{ - - typedef detail::int8 cl_char; //!< \brief 8bit signed integer. (from GLM_GTX_ocl_type extension) - typedef detail::int16 cl_short; //!< \brief 16bit signed integer. (from GLM_GTX_ocl_type extension) - typedef detail::int32 cl_int; //!< \brief 32bit signed integer. (from GLM_GTX_ocl_type extension) - typedef detail::int64 cl_long; //!< \brief 64bit signed integer. (from GLM_GTX_ocl_type extension) - - typedef detail::uint8 cl_uchar; //!< \brief 8bit signed integer. (from GLM_GTX_ocl_type extension) - typedef detail::uint16 cl_ushort; //!< \brief 16bit signed integer. (from GLM_GTX_ocl_type extension) - typedef detail::uint32 cl_uint; //!< \brief 32bit signed integer. (from GLM_GTX_ocl_type extension) - typedef detail::uint64 cl_ulong; //!< \brief 64bit signed integer. (from GLM_GTX_ocl_type extension) - - typedef detail::float16 cl_half; //!< \brief Half-precision floating-point scalar. (from GLM_GTX_ocl_type extension) - typedef detail::float32 cl_float; //!< \brief Single-precision floating-point scalar. (from GLM_GTX_ocl_type extension) - - - typedef detail::int8 cl_char1; //!< \brief 8bit signed integer. (from GLM_GTX_ocl_type extension) - typedef detail::int16 cl_short1; //!< \brief 16bit signed integer. (from GLM_GTX_ocl_type extension) - typedef detail::int32 cl_int1; //!< \brief 32bit signed integer. (from GLM_GTX_ocl_type extension) - typedef detail::int64 cl_long1; //!< \brief 64bit signed integer. (from GLM_GTX_ocl_type extension) - - typedef detail::uint8 cl_uchar1; //!< \brief 8bit signed integer. (from GLM_GTX_ocl_type extension) - typedef detail::uint16 cl_ushort1; //!< \brief 16bit signed integer. (from GLM_GTX_ocl_type extension) - typedef detail::uint32 cl_uint1; //!< \brief 32bit signed integer. (from GLM_GTX_ocl_type extension) - typedef detail::uint64 cl_ulong1; //!< \brief 64bit signed integer. (from GLM_GTX_ocl_type extension) - - //typedef detail::float16 cl_half1; //!< \brief Half-precision floating-point scalar. (from GLM_GTX_ocl_type extension) - typedef detail::float32 cl_float1; //!< \brief Single-precision floating-point scalar. (from GLM_GTX_ocl_type extension) - - - typedef detail::tvec2 cl_char2; //!< \brief 8bit signed integer. (from GLM_GTX_ocl_type extension) - typedef detail::tvec2 cl_short2; //!< \brief 16bit signed integer. (from GLM_GTX_ocl_type extension) - typedef detail::tvec2 cl_int2; //!< \brief 32bit signed integer. (from GLM_GTX_ocl_type extension) - typedef detail::tvec2 cl_long2; //!< \brief 64bit signed integer. (from GLM_GTX_ocl_type extension) - - typedef detail::tvec2 cl_uchar2; //!< \brief 8bit signed integer. (from GLM_GTX_ocl_type extension) - typedef detail::tvec2 cl_ushort2; //!< \brief 16bit signed integer. (from GLM_GTX_ocl_type extension) - typedef detail::tvec2 cl_uint2; //!< \brief 32bit signed integer. (from GLM_GTX_ocl_type extension) - typedef detail::tvec2 cl_ulong2; //!< \brief 64bit signed integer. (from GLM_GTX_ocl_type extension) - - //typedef detail::tvec2 cl_half2; //!< \brief Half-precision floating-point scalar. (from GLM_GTX_ocl_type extension) - typedef detail::tvec2 cl_float2; //!< \brief Single-precision floating-point scalar. (from GLM_GTX_ocl_type extension) - - - typedef detail::tvec3 cl_char3; //!< \brief 8bit signed integer. (from GLM_GTX_ocl_type extension) - typedef detail::tvec3 cl_short3; //!< \brief 16bit signed integer. (from GLM_GTX_ocl_type extension) - typedef detail::tvec3 cl_int3; //!< \brief 32bit signed integer. (from GLM_GTX_ocl_type extension) - typedef detail::tvec3 cl_long3; //!< \brief 64bit signed integer. (from GLM_GTX_ocl_type extension) - - typedef detail::tvec3 cl_uchar3; //!< \brief 8bit signed integer. (from GLM_GTX_ocl_type extension) - typedef detail::tvec3 cl_ushort3; //!< \brief 16bit signed integer. (from GLM_GTX_ocl_type extension) - typedef detail::tvec3 cl_uint3; //!< \brief 32bit signed integer. (from GLM_GTX_ocl_type extension) - typedef detail::tvec3 cl_ulong3; //!< \brief 64bit signed integer. (from GLM_GTX_ocl_type extension) - - //typedef detail::tvec3 cl_half3; //!< \brief Half-precision floating-point scalar. (from GLM_GTX_ocl_type extension) - typedef detail::tvec3 cl_float3; //!< \brief Single-precision floating-point scalar. (from GLM_GTX_ocl_type extension) - - - typedef detail::tvec4 cl_char4; //!< \brief 8bit signed integer. (from GLM_GTX_ocl_type extension) - typedef detail::tvec4 cl_short4; //!< \brief 16bit signed integer. (from GLM_GTX_ocl_type extension) - typedef detail::tvec4 cl_int4; //!< \brief 32bit signed integer. (from GLM_GTX_ocl_type extension) - typedef detail::tvec4 cl_long4; //!< \brief 64bit signed integer. (from GLM_GTX_ocl_type extension) - typedef detail::tvec4 cl_uchar4; //!< \brief 8bit signed integer. (from GLM_GTX_ocl_type extension) - typedef detail::tvec4 cl_ushort4; //!< \brief 16bit signed integer. (from GLM_GTX_ocl_type extension) - typedef detail::tvec4 cl_uint4; //!< \brief 32bit signed integer. (from GLM_GTX_ocl_type extension) - typedef detail::tvec4 cl_ulong4; //!< \brief 64bit signed integer. (from GLM_GTX_ocl_type extension) - - //typedef detail::tvec4 cl_half4; //!< \brief Half-precision floating-point scalar. (from GLM_GTX_ocl_type extension) - typedef detail::tvec4 cl_float4; //!< \brief Single-precision floating-point scalar. (from GLM_GTX_ocl_type extension) - - /// @} -}//namespace gtx -}//namespace glm - -#include "ocl_type.inl" - -#endif//GLM_GTX_ocl_type diff --git a/glm/gtx/ocl_type.inl b/glm/gtx/ocl_type.inl deleted file mode 100644 index ac151458..00000000 --- a/glm/gtx/ocl_type.inl +++ /dev/null @@ -1,27 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -/// OpenGL Mathematics (glm.g-truc.net) -/// -/// Copyright (c) 2005 - 2013 G-Truc Creation (www.g-truc.net) -/// Permission is hereby granted, free of charge, to any person obtaining a copy -/// of this software and associated documentation files (the "Software"), to deal -/// in the Software without restriction, including without limitation the rights -/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -/// copies of the Software, and to permit persons to whom the Software is -/// furnished to do so, subject to the following conditions: -/// -/// The above copyright notice and this permission notice shall be included in -/// all copies or substantial portions of the Software. -/// -/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -/// THE SOFTWARE. -/// -/// @ref gtx_ocl_type -/// @file glm/gtx/ocl_type.inl -/// @date 2013-03-16 / 2013-03-16 -/// @author Christophe Riccio -/////////////////////////////////////////////////////////////////////////////////// diff --git a/readme.txt b/readme.txt index 99a87fca..6a5f12e9 100644 --- a/readme.txt +++ b/readme.txt @@ -48,6 +48,7 @@ GLM 0.9.5.0: 2013-XX-XX - Added precision variation of each type - Added quaternion comparison functions - Fixed GTX_multiple for negative value +- Removed GTX_ocl_type extension ================================================================================ GLM 0.9.4.4: 2013-0X-XX