From a10a94dcb86e51d74d7c545d99d98110f88e3081 Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Tue, 16 Aug 2022 16:24:37 -0400 Subject: Add some simple macro defines including __HLSL_VERSION (#2363) * #include an absolute path didn't work - because paths were taken to always be relative. * Add standard macros including __HLSL_VERSION * Added hlsl test. * Defined standard macro names to values, so not undefined. Allows more convenient #if style. Co-authored-by: Yong He --- tests/preprocessor/simple-pre-defined.hlsl | 9 +++++++++ tests/preprocessor/simple-pre-defined.hlsl.expected | 6 ++++++ tests/preprocessor/simple-pre-defined.slang | 9 +++++++++ tests/preprocessor/simple-pre-defined.slang.expected | 6 ++++++ 4 files changed, 30 insertions(+) create mode 100644 tests/preprocessor/simple-pre-defined.hlsl create mode 100644 tests/preprocessor/simple-pre-defined.hlsl.expected create mode 100644 tests/preprocessor/simple-pre-defined.slang create mode 100644 tests/preprocessor/simple-pre-defined.slang.expected (limited to 'tests/preprocessor') diff --git a/tests/preprocessor/simple-pre-defined.hlsl b/tests/preprocessor/simple-pre-defined.hlsl new file mode 100644 index 000000000..7789eb8eb --- /dev/null +++ b/tests/preprocessor/simple-pre-defined.hlsl @@ -0,0 +1,9 @@ +//DIAGNOSTIC_TEST:SIMPLE:-E + +__SLANG_COMPILER__ + +__HLSL_VERSION + +__SLANG__ + +__HLSL__ \ No newline at end of file diff --git a/tests/preprocessor/simple-pre-defined.hlsl.expected b/tests/preprocessor/simple-pre-defined.hlsl.expected new file mode 100644 index 000000000..98911f3c7 --- /dev/null +++ b/tests/preprocessor/simple-pre-defined.hlsl.expected @@ -0,0 +1,6 @@ +result code = 0 +standard error = { +} +standard output = { +1 2020 0 1 +} diff --git a/tests/preprocessor/simple-pre-defined.slang b/tests/preprocessor/simple-pre-defined.slang new file mode 100644 index 000000000..7789eb8eb --- /dev/null +++ b/tests/preprocessor/simple-pre-defined.slang @@ -0,0 +1,9 @@ +//DIAGNOSTIC_TEST:SIMPLE:-E + +__SLANG_COMPILER__ + +__HLSL_VERSION + +__SLANG__ + +__HLSL__ \ No newline at end of file diff --git a/tests/preprocessor/simple-pre-defined.slang.expected b/tests/preprocessor/simple-pre-defined.slang.expected new file mode 100644 index 000000000..4b5184e74 --- /dev/null +++ b/tests/preprocessor/simple-pre-defined.slang.expected @@ -0,0 +1,6 @@ +result code = 0 +standard error = { +} +standard output = { +1 2020 1 0 +} -- cgit v1.2.3