From 996d4dc537272e36dde1d9c1110064d597fa212f Mon Sep 17 00:00:00 2001 From: Tim Foley Date: Tue, 27 Jun 2017 09:13:19 -0700 Subject: Emit global-scope parameters from imported files. This fixes up a bug in the earlier change that provided reflection for imported parameters; I'd failed to confirm that the code generation logic can handle imported parameters correctly. The main fix was to have an `import` declaration automatically use the global-scope layout already determined, sine imported parameters will in general appear there. --- tests/render/imported-parameters.slang | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 tests/render/imported-parameters.slang (limited to 'tests/render/imported-parameters.slang') diff --git a/tests/render/imported-parameters.slang b/tests/render/imported-parameters.slang new file mode 100644 index 000000000..7c444a67b --- /dev/null +++ b/tests/render/imported-parameters.slang @@ -0,0 +1,23 @@ +//TEST_IGNORE_FILE: + +// We are declaring the uniform shader parameters +// in this imported file, to ensure that they are +// emitted correctly. + +cbuffer Uniforms +{ + float4x4 modelViewProjection; +}; + +float3 transformColor(float3 color) +{ + float3 result; + + result.x = sin(20.0 * (color.x + color.y)); + result.y = saturate(cos(color.z * 30.0)); + result.z = sin(color.x * color.y * color.z * 100.0); + + result = 0.5 * (result + 1); + + return result; +} \ No newline at end of file -- cgit v1.2.3