diff options
| author | Tim Foley <tfoleyNV@users.noreply.github.com> | 2018-04-11 16:18:29 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-11 16:18:29 -0700 |
| commit | baf194e7456ba4568dcf11249896af35b3ce18cc (patch) | |
| tree | f75e20db450100d41bfa9c384a8bab0fdc28a749 /tests/hlsl/dxsdk/BasicHLSL11 | |
| parent | 6322983fa4dc84ef1e9dd8fad54d4c1580436e67 (diff) | |
Introduce an IR-level type system (#481)
* Introduce an IR-level type system
Up to this point, the Slang IR has used the front-end type system to represent types in the IR.
As a result (but ultimately more importantly) the IR representation of generics and specialization has used AST-level concepts embedded in the IR.
For example, to express the specialization of `vector<T,N>` to a concrete type `float` for `T`, we needed an IR operation that could represent the specialization, with operands that somehow represented the type argument `float`.
The whole thing was very complicated.
The big idea of this change is to introduce a new representation in which types in the IR are just ordinary instructions, so that using them as operands makes sense. The hierarchy of IR types closely mirrors the AST-side hierarchy for now, and that will probably be something we should maintain going forward.
In order to make these changes work, though, I also had to do major overhauls of things like the way substitutions are performed, how we check interface conformances, the way lookup through interface types is done, etc. etc. This is a big change, and unfortunately any attempt to summarize it in the commit message wouldn't do it justice.
* Fix 64-bit build warning
* Fix up some clang warnings/errors
Diffstat (limited to 'tests/hlsl/dxsdk/BasicHLSL11')
| -rw-r--r-- | tests/hlsl/dxsdk/BasicHLSL11/BasicHLSL11_PS.hlsl | 9 | ||||
| -rw-r--r-- | tests/hlsl/dxsdk/BasicHLSL11/BasicHLSL11_VS.hlsl | 7 |
2 files changed, 16 insertions, 0 deletions
diff --git a/tests/hlsl/dxsdk/BasicHLSL11/BasicHLSL11_PS.hlsl b/tests/hlsl/dxsdk/BasicHLSL11/BasicHLSL11_PS.hlsl index 09c5dcc7e..d119653a9 100644 --- a/tests/hlsl/dxsdk/BasicHLSL11/BasicHLSL11_PS.hlsl +++ b/tests/hlsl/dxsdk/BasicHLSL11/BasicHLSL11_PS.hlsl @@ -1,4 +1,13 @@ //TEST:COMPARE_HLSL:-no-mangle -target dxbc-assembly -profile ps_4_0 -entry PSMain + +#ifndef __SLANG__ +#define cbPerFrame _SV031SLANG_parameterGroup_cbPerFrame +#define g_vLightDir _SV031SLANG_ParameterGroup_cbPerFrame11g_vLightDir +#define g_fAmbient _SV031SLANG_ParameterGroup_cbPerFrame10g_fAmbient +#define g_samLinear _SV011g_samLinear +#define g_txDiffuse _SV011g_txDiffuse +#endif + //-------------------------------------------------------------------------------------- // File: BasicHLSL11_PS.hlsl // diff --git a/tests/hlsl/dxsdk/BasicHLSL11/BasicHLSL11_VS.hlsl b/tests/hlsl/dxsdk/BasicHLSL11/BasicHLSL11_VS.hlsl index cb2c1b950..6d854a83b 100644 --- a/tests/hlsl/dxsdk/BasicHLSL11/BasicHLSL11_VS.hlsl +++ b/tests/hlsl/dxsdk/BasicHLSL11/BasicHLSL11_VS.hlsl @@ -1,4 +1,11 @@ //TEST:COMPARE_HLSL: -target dxbc-assembly -profile vs_4_0 -entry VSMain + +#ifndef __SLANG__ +#define cbPerObject _SV032SLANG_parameterGroup_cbPerObject +#define g_mWorldViewProjection _SV032SLANG_ParameterGroup_cbPerObject22g_mWorldViewProjection +#define g_mWorld _SV032SLANG_ParameterGroup_cbPerObject8g_mWorld +#endif + //-------------------------------------------------------------------------------------- // File: BasicHLSL11_VS.hlsl // |