summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Foley <tfoleyNV@users.noreply.github.com>2017-07-21 13:48:58 -0700
committerGitHub <noreply@github.com>2017-07-21 13:48:58 -0700
commit30fbf640cd4cd6936e177fdfadb76e8814cffffc (patch)
tree6247fb2e5ce3c97243b2c7520512f00e35da04c6
parent6992d0e3eb7eab04f05da99adcf437cfdbfbbb79 (diff)
parent5a63cb07dec5296513a7170a19d588ade94fdf43 (diff)
Merge pull request #135 from tfoleyNV/falcor-hashed-alpha-fixups
Map HLSL `frac()` to GLSL `fract()`
-rw-r--r--source/slang/slang-stdlib.cpp17
1 files changed, 14 insertions, 3 deletions
diff --git a/source/slang/slang-stdlib.cpp b/source/slang/slang-stdlib.cpp
index 60b69818c..2a0d2abb2 100644
--- a/source/slang/slang-stdlib.cpp
+++ b/source/slang/slang-stdlib.cpp
@@ -560,9 +560,20 @@ __generic<T : __BuiltinFloatingPointType, let N : int> __intrinsic vector<T,N> f
__generic<T : __BuiltinFloatingPointType, let N : int, let M : int> __intrinsic matrix<T,N,M> fmod(matrix<T,N,M> x, matrix<T,N,M> y);
// Fractional part
-__generic<T : __BuiltinFloatingPointType> __intrinsic T frac(T x);
-__generic<T : __BuiltinFloatingPointType, let N : int> __intrinsic vector<T,N> frac(vector<T,N> x);
-__generic<T : __BuiltinFloatingPointType, let N : int, let M : int> __intrinsic matrix<T,N,M> frac(matrix<T,N,M> x);
+__generic<T : __BuiltinFloatingPointType>
+__intrinsic(glsl, fract)
+__intrinsic
+T frac(T x);
+
+__generic<T : __BuiltinFloatingPointType, let N : int>
+__intrinsic(glsl, fract)
+__intrinsic
+vector<T,N> frac(vector<T,N> x);
+
+__generic<T : __BuiltinFloatingPointType, let N : int, let M : int>
+__intrinsic(glsl, fract)
+__intrinsic
+matrix<T,N,M> frac(matrix<T,N,M> x);
// Split float into mantissa and exponent
__generic<T : __BuiltinFloatingPointType> __intrinsic T frexp(T x, out T exp);