diff options
| author | Tim Foley <tfoley@nvidia.com> | 2017-06-26 09:32:40 -0700 |
|---|---|---|
| committer | Tim Foley <tfoley@nvidia.com> | 2017-06-26 12:06:54 -0700 |
| commit | 7d3bfe403362b294cc2a1f2607d51dfcd447aafd (patch) | |
| tree | 4dac8dcdb29a0d8e74f78f12c0bbe63e669b2b0c /tests | |
| parent | 3f316dcbd9274efc74f817cf36f17a511ff2e21e (diff) | |
Replace "auto-import" with `#import`
Right now `#import` only differs from `#include` in that it takes a string literal for a file name instead of a raw identifier (to which `.slang` gets appended).
The next step is to make `#import` respect preprocessor state, while `__import` doesn't.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/render/pound-import.hlsl (renamed from tests/render/auto-import.hlsl) | 4 | ||||
| -rw-r--r-- | tests/render/pound-import.slang.h (renamed from tests/render/auto-import.slang.h) | 0 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/render/auto-import.hlsl b/tests/render/pound-import.hlsl index 588ebc612..a9b625fb6 100644 --- a/tests/render/auto-import.hlsl +++ b/tests/render/pound-import.hlsl @@ -1,4 +1,4 @@ -//TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER: -xslang -auto-import-dir -xslang tests/render/ +//TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER: // This is a basic test case for cross-compilation behavior. // @@ -8,7 +8,7 @@ // Pull in Spire code depdendency using extended syntax: -#include "auto-import.slang.h" +#import "pound-import.slang.h" #if defined(__HLSL__) diff --git a/tests/render/auto-import.slang.h b/tests/render/pound-import.slang.h index d53005688..d53005688 100644 --- a/tests/render/auto-import.slang.h +++ b/tests/render/pound-import.slang.h |