mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

(GLM) Cleanups

Browse Source
This commit is contained in:
twinaphex 2016-11-01 06:51:07 +01:00
parent 0fd569983c
commit af9136c341
3 changed files with 112 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
deps/glm/detail/intrinsic_exponential.inl vendored
View File

@ -1,27 +0,0 @@
///////////////////////////////////////////////////////////////////////////////////
/// OpenGL Mathematics (glm.g-truc.net)
///
/// Copyright (c) 2005 - 2014 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 core
/// @file glm/core/intrinsic_exponential.inl
/// @date 2011-06-15 / 2011-06-15
/// @author Christophe Riccio
///////////////////////////////////////////////////////////////////////////////////

10
deps/glm/detail/type_half.hpp vendored
View File

@ -34,16 +34,10 @@
namespace glm{
namespace detail
{
typedef short hdata;
GLM_FUNC_DECL float toFloat32(hdata value);
GLM_FUNC_DECL hdata toFloat16(float const & value);
GLM_FUNC_DECL float toFloat32(int16_t value);
GLM_FUNC_DECL int16_t toFloat16(float const & value);
}//namespace detail
/// half-precision floating-point numbers.
//typedef detail::hdata half;
}//namespace glm
#include "type_half.inl"

27
deps/glm/detail/type_half.inl vendored
View File

@ -61,7 +61,7 @@ namespace detail
uint32 i;
};
GLM_FUNC_QUALIFIER float toFloat32(hdata value)
GLM_FUNC_QUALIFIER float toFloat32(int16_t value)
{
int s = (value >> 15) & 0x00000001;
int e = (value >> 10) & 0x0000001f;
@ -135,7 +135,7 @@ namespace detail
return Result.f;
}
GLM_FUNC_QUALIFIER hdata toFloat16(float const & f)
GLM_FUNC_QUALIFIER int16_t toFloat16(float const & f)
{
uif32 Entry;
Entry.f = f;
@ -171,7 +171,7 @@ namespace detail
// We convert f to a half zero.
//
return hdata(s);
return (int16_t)(s);
}
//
@ -199,9 +199,10 @@ namespace detail
// Assemble the half from s, e (zero) and m.
//
return hdata(s | (m >> 13));
return (int16_t)(s | (m >> 13));
}
else if(e == 0xff - (127 - 15))
if(e == 0xff - (127 - 15))
{
if(m == 0)
{
@ -210,10 +211,9 @@ namespace detail
// infinity with the same sign as f.
//
return hdata(s | 0x7c00);
return (int16_t)(s | 0x7c00);
}
else
{
//
// F is a NAN; we produce a half NAN that preserves
// the sign bit and the 10 leftmost bits of the
@ -225,11 +225,9 @@ namespace detail
m >>= 13;
return hdata(s | 0x7c00 | m | (m == 0));
return (int16_t)(s | 0x7c00 | m | (m == 0));
}
}
else
{
//
// E is greater than zero. F is a normalized float.
// We try to convert f to a normalized half.
@ -258,7 +256,7 @@ namespace detail
{
overflow(); // Cause a hardware floating point overflow;
return hdata(s | 0x7c00);
return (int16_t)(s | 0x7c00);
// if this returns, the half becomes an
} // infinity with the same sign as f.
@ -266,8 +264,7 @@ namespace detail
// Assemble the half from s, e and m.
//
return hdata(s | (e << 10) | (m >> 13));
}
return (int16_t)(s | (e << 10) | (m >> 13));
}
}//namespace detail