diff options
| -rw-r--r-- | slang.h | 6 | ||||
| -rw-r--r-- | source/slang/lower.cpp | 11 | ||||
| -rw-r--r-- | source/slang/options.cpp | 4 | ||||
| -rw-r--r-- | tests/rewriter/type-splitting.hlsl | 59 | ||||
| -rw-r--r-- | tests/rewriter/type-splitting.slang | 3 |
5 files changed, 82 insertions, 1 deletions
@@ -93,7 +93,11 @@ extern "C" typedef unsigned int SlangCompileFlags; enum { - SLANG_COMPILE_FLAG_NO_CHECKING = 1 << 0, /**< Disable semantic checking as much as possible. */ + /** Disable semantic checking as much as possible. */ + SLANG_COMPILE_FLAG_NO_CHECKING = 1 << 0, + + /* Split apart types that contain a mix of resource and non-resource data */ + SLANG_COMPILE_FLAG_SPLIT_MIXED_TYPES = 1 << 1, }; /*! diff --git a/source/slang/lower.cpp b/source/slang/lower.cpp index 7a12fc3b7..70c153902 100644 --- a/source/slang/lower.cpp +++ b/source/slang/lower.cpp @@ -2833,6 +2833,17 @@ struct LoweringVisitor // due to, e.g., bindless textures. shouldDesugarTupleTypes = true; } + else if( shared->compileRequest->compileFlags & SLANG_COMPILE_FLAG_SPLIT_MIXED_TYPES ) + { + // If the user is directly asking us to do this transformation, + // then obviously we need to do it. + // + // TODO: The way this is defined here means it will even apply to user + // HLSL code (not just code written in Slang). We may want to + // reconsider that choice, and only split things that originated in Slang. + // + shouldDesugarTupleTypes = true; + } bool isResultATupleType = false; bool hasAnyNonTupleFields = false; diff --git a/source/slang/options.cpp b/source/slang/options.cpp index a360695f2..0e329ccd2 100644 --- a/source/slang/options.cpp +++ b/source/slang/options.cpp @@ -254,6 +254,10 @@ struct OptionsParser //else if (argStr == "-no-checking") flags |= SLANG_COMPILE_FLAG_NO_CHECKING; + else if(argStr == "-split-mixed-types" ) + { + flags |= SLANG_COMPILE_FLAG_SPLIT_MIXED_TYPES; + } else if (argStr == "-backend" || argStr == "-target") { String name = tryReadCommandLineArgument(arg, &argCursor, argEnd); diff --git a/tests/rewriter/type-splitting.hlsl b/tests/rewriter/type-splitting.hlsl new file mode 100644 index 000000000..c8d69f5fd --- /dev/null +++ b/tests/rewriter/type-splitting.hlsl @@ -0,0 +1,59 @@ +//TEST:COMPARE_HLSL: -split-mixed-types -no-checking -target dxbc-assembly -profile ps_4_0 -entry main + +// Confirm that the `-split-mixed-types` flag works. + +#ifdef __SLANG__ + +// HLSL input: +// +// - Uses at least one `import` of Slang code +// - Uses an aggregate type that mixes resource and non-resource types +// + +__import type_splitting; + +struct Foo +{ + Texture2D t; + SamplerState s; + float2 u; +}; + +cbuffer C +{ + Foo foo; +} + +float4 main() : SV_Target +{ + return foo.t.Sample(foo.s, foo.u); +} + +#else + +// Equivalent raw HLSL: +// +// - Fields of resource type have been stripped from original type definition +// - Fields of resource type get hoisted out of variable declarations +// + +struct Foo +{ + float2 u; +}; + +cbuffer C +{ + Foo foo; +} + +Texture2D SLANG_parameterBlock_C_foo_t; +SamplerState SLANG_parameterBlock_C_foo_s; + +float4 main() : SV_Target +{ + return SLANG_parameterBlock_C_foo_t.Sample(SLANG_parameterBlock_C_foo_s, foo.u); +} + +#endif + diff --git a/tests/rewriter/type-splitting.slang b/tests/rewriter/type-splitting.slang new file mode 100644 index 000000000..548836fbb --- /dev/null +++ b/tests/rewriter/type-splitting.slang @@ -0,0 +1,3 @@ +//TEST_IGNORE_FILE: + +// This file only exists so that `type-splitting.hlsl` officially appears to be using some Slang code. |