diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2020-02-06 14:31:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-06 14:31:09 -0500 |
| commit | d3331fba6eaab44646010b556106da38925d43e0 (patch) | |
| tree | f54115540a457375a5d050bbfe1b04855b3f791b /source/slang/slang-emit-glsl.cpp | |
| parent | 9c84cceffba26817721a23a1a85a48644bf3a560 (diff) | |
Literal handling improvements (#1202)
* WIP: 64 literal diagnostic and truncation.
* Improve how integer truncation is handled/supported.
Added literal-int64.slang test.
Set a suffix on all literals.
Fixed problem on C++ based targets where l suffix was not the same as int() cast. So on C++ derived emitters, int() is used instead of l suffix to have same behavior across targets.
* Add literal diagnostic testing.
* Allow lexer to lex - in front of literals.
* Fix lexing and converting int literal with -.
* Too large small values of floats become inf.
Handling writing inf types out on different targets.
Add function to deterimine if a float literals kind.
* Roll back the support of lexer lexing negative literals.
* Fixed tests broken because of diagnostics numbers.
Improved _isFinite
* Fix compilation on linux.
* Fix problem with abs on linux - use Math::Abs.
* Fix typo.
* * Improve warnings for float literals zeroed
* Improved 64 bit type documentation
* Handle half
* Improved comments
* Fixed tests broken
* Use capital letters for suffixes.
* Make default behavior on outputting a int literal that is an 'int32_t' is cast (not suffix) to avoid platform inconsistencies.
Improve documentation for 64 bit types.
Make tests cover material in docs.
* Fixed tests.
* Rename FloatKind::Normal -> Finite
* Fix half zero check.
Diffstat (limited to 'source/slang/slang-emit-glsl.cpp')
| -rw-r--r-- | source/slang/slang-emit-glsl.cpp | 51 |
1 files changed, 48 insertions, 3 deletions
diff --git a/source/slang/slang-emit-glsl.cpp b/source/slang/slang-emit-glsl.cpp index c319f44e9..fbae21f75 100644 --- a/source/slang/slang-emit-glsl.cpp +++ b/source/slang/slang-emit-glsl.cpp @@ -671,24 +671,69 @@ void GLSLSourceEmitter::emitSimpleValueImpl(IRInst* inst) { switch (type->getBaseType()) { - default: break; + default: + + case BaseType::Int8: + case BaseType::Int16: + case BaseType::Int: + { + m_writer->emit(litInst->value.intVal); + return; + } + case BaseType::UInt8: + case BaseType::UInt16: + case BaseType::UInt: + { + m_writer->emit(UInt(litInst->value.intVal)); + m_writer->emit("U"); + return; + } case BaseType::Int64: { m_writer->emitInt64(int64_t(litInst->value.intVal)); - m_writer->emit("l"); + m_writer->emit("L"); return; } case BaseType::UInt64: { SLANG_COMPILE_TIME_ASSERT(sizeof(litInst->value.intVal) >= sizeof(uint64_t)); m_writer->emitUInt64(uint64_t(litInst->value.intVal)); - m_writer->emit("ul"); + m_writer->emit("UL"); return; } + } } break; } + case kIROp_FloatLit: + { + IRConstant* constantInst = static_cast<IRConstant*>(inst); + + IRConstant::FloatKind kind = constantInst->getFloatKind(); + + switch (kind) + { + case IRConstant::FloatKind::Nan: + { + m_writer->emit("(0.0 / 0.0)"); + return; + } + case IRConstant::FloatKind::PositiveInfinity: + { + m_writer->emit("(1.0 / 0.0)"); + return; + } + case IRConstant::FloatKind::NegativeInfinity: + { + m_writer->emit("(-1.0 / 0.0)"); + return; + } + default: break; + } + break; + } + default: break; } |
