diff options
| author | Tim Foley <tfoleyNV@users.noreply.github.com> | 2019-09-18 13:20:22 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-18 13:20:22 -0700 |
| commit | a431d4f6da9e463c349c2e3819e87a83c8f2e043 (patch) | |
| tree | 08c10331608d0483dc89b5a0abd3ed9cc6878a75 /prelude | |
| parent | a4c7cf32872c8bb191ee78ed91887a66f0b8b0f1 (diff) | |
Clean up some behavior of operator% (#1060)
Work on #1059
The `%` operator in the Slang implementation had several issues, and this change tries to address some of them:
* Renamed most occurences of "mod" describing this operator to be "rem" for "remainder" to better match its semantics in HLSL
* Split the operator into distinct integer and floating-point variants (`IRem` and `FRem`) to simplify having different codegen for the two
* Added floating-point variants of `operator%` and `operator%=` to the stdlib.
* Added custom C++ codegen for `kIROp_FRem` such that it maps to the standard C/C++ `remainder()` function
* Added custom GLSL codegen so that `kIROp_FRem` maps to the GLSL `mod()` function (which isn't correct...)
* Added a test case to confirm that D3D11, D3D12, and CPU targets all agree on the definition of floating-point `%`
* Fixed `render-test-tool` to allow a negative integer in a `data=...` specification. This didn't end up being used in the final test, but still seems like a good fix.
* Added a customized baseline for the Vulkan flavor of that test to confirm that we are *not* compiling correctly to SPIR-V just yet
Addressing the correctness of the output for GLSL/SPIR-V will have to come as a later change given that the operation we want is not exposed directly by unextended GLSL.
Diffstat (limited to 'prelude')
| -rw-r--r-- | prelude/slang-cpp-scalar-intrinsics.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/prelude/slang-cpp-scalar-intrinsics.h b/prelude/slang-cpp-scalar-intrinsics.h index 8809d9575..081b31265 100644 --- a/prelude/slang-cpp-scalar-intrinsics.h +++ b/prelude/slang-cpp-scalar-intrinsics.h @@ -62,6 +62,7 @@ SLANG_FORCE_INLINE float F32_min(float a, float b) { return a < b ? a : b; } SLANG_FORCE_INLINE float F32_max(float a, float b) { return a > b ? a : b; } SLANG_FORCE_INLINE float F32_pow(float a, float b) { return ::powf(a, b); } SLANG_FORCE_INLINE float F32_fmod(float a, float b) { return ::fmodf(a, b); } +SLANG_FORCE_INLINE float F32_remainder(float a, float b) { return ::remainderf(a, b); } SLANG_FORCE_INLINE float F32_step(float a, float b) { return float(a >= b); } SLANG_FORCE_INLINE float F32_atan2(float a, float b) { return float(atan2(a, b)); } @@ -110,6 +111,7 @@ SLANG_FORCE_INLINE double F64_min(double a, double b) { return a < b ? a : b; } SLANG_FORCE_INLINE double F64_max(double a, double b) { return a > b ? a : b; } SLANG_FORCE_INLINE double F64_pow(double a, double b) { return ::pow(a, b); } SLANG_FORCE_INLINE double F64_fmod(double a, double b) { return ::fmod(a, b); } +SLANG_FORCE_INLINE double F64_remainder(double a, double b) { return ::remainder(a, b); } SLANG_FORCE_INLINE double F64_step(double a, double b) { return double(a >= b); } SLANG_FORCE_INLINE double F64_atan2(double a, double b) { return atan2(a, b); } |
