summaryrefslogtreecommitdiffstats
path: root/tests/rewriter
diff options
context:
space:
mode:
authorTim Foley <tfoley@nvidia.com>2017-08-17 08:59:30 -0700
committerTim Foley <tfoley@nvidia.com>2017-08-17 08:59:30 -0700
commitd13bd05164c6a3d0b7ba95bb415f6bfac4cfcb70 (patch)
treed1b85e1553b0a81d2322f043d3e4022bd9d780c1 /tests/rewriter
parent3dd88c2eb5cd2e405cd5aa184a2cd45db6fb027a (diff)
Add a flag to control type splitting
The `-split-mixed-types` flag can be provided to command-line `slangc`, and the `SLANG_COMPILE_FLAG_SPLIT_MIXED_TYPE` flag can be passed to `spSetCompileFlags`. Either of these turns on a mode where Slang will split types that included both resource and non-resource fields. The declaration of such a type will just drop the resource fields, while a variable declare using such a type turns into multiple declararations: one for the non-resource fields, and then one for each resource field (recursively). This behavior was already implemented for GLSL support, and this change just adds a flag so that the user can turn it on unconditionally. Caveats: - This does not apply in "full rewriter" mode, which is what happens if the user doesn't use any `import`s. I could try to fix that, but it seems like in that mode people are asking to bypass as much of the compiler as possible. - When it *does* apply, it applies to user code as well as library/Slang code. So this will potentially rewrite the user's own HLSL in ways they wouldn't expect. I don't see a great way around it, though.
Diffstat (limited to 'tests/rewriter')
-rw-r--r--tests/rewriter/type-splitting.hlsl59
-rw-r--r--tests/rewriter/type-splitting.slang3
2 files changed, 62 insertions, 0 deletions
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.