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 /source/slang/slang-stdlib.cpp | |
| 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 'source/slang/slang-stdlib.cpp')
| -rw-r--r-- | source/slang/slang-stdlib.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/slang/slang-stdlib.cpp b/source/slang/slang-stdlib.cpp index 036a40ac2..c1a9d59d2 100644 --- a/source/slang/slang-stdlib.cpp +++ b/source/slang/slang-stdlib.cpp @@ -216,7 +216,8 @@ namespace Slang { kIROp_Sub, "-", ARITHMETIC_MASK }, { kIROp_Mul, "*", ARITHMETIC_MASK }, { kIROp_Div, "/", ARITHMETIC_MASK }, - { kIROp_Mod, "%", INT_MASK }, + { kIROp_IRem, "%", INT_MASK }, + { kIROp_FRem, "%", FLOAT_MASK }, { kIROp_And, "&&", BOOL_MASK | BOOL_RESULT}, { kIROp_Or, "||", BOOL_MASK | BOOL_RESULT }, { kIROp_BitAnd, "&", LOGICAL_MASK }, @@ -234,7 +235,8 @@ namespace Slang { kIRPseudoOp_SubAssign, "-=", ASSIGNMENT | ARITHMETIC_MASK }, { kIRPseudoOp_MulAssign, "*=", ASSIGNMENT | ARITHMETIC_MASK }, { kIRPseudoOp_DivAssign, "/=", ASSIGNMENT | ARITHMETIC_MASK }, - { kIRPseudoOp_ModAssign, "%=", ASSIGNMENT | ARITHMETIC_MASK }, + { kIRPseudoOp_IRemAssign, "%=", ASSIGNMENT | INT_MASK }, + { kIRPseudoOp_FRemAssign, "%=", ASSIGNMENT | FLOAT_MASK }, { kIRPseudoOp_AndAssign, "&=", ASSIGNMENT | LOGICAL_MASK }, { kIRPseudoOp_OrAssign, "|=", ASSIGNMENT | LOGICAL_MASK }, { kIRPseudoOp_XorAssign, "^=", ASSIGNMENT | LOGICAL_MASK }, |