Merge pull request #372 from csyonghe/master

Allow type expression as type argument, fix global param enum order

2 files changed, 5 insertions, 1 deletions

diff --git a/tools/render-test/shader-input-layout.cpp b/tools/render-test/shader-input-layout.cpp
index 01328eabd..fcf25f376 100644
--- a/tools/render-test/shader-input-layout.cpp
+++ b/tools/render-test/shader-input-layout.cpp
@@ -20,7 +20,10 @@ namespace renderer_test
                     if (parser.LookAhead("type"))
                     {
                         parser.ReadToken();
-                        globalTypeArguments.Add(parser.ReadWord());
+                        StringBuilder typeExp;
+                        while (!parser.IsEnd())
+                            typeExp << parser.ReadToken().Content;
+                        globalTypeArguments.Add(typeExp);
                     }
                     else
                     {
diff --git a/tools/render-test/slang-support.cpp b/tools/render-test/slang-support.cpp
index cfbc24382..9263aa41b 100644
--- a/tools/render-test/slang-support.cpp
+++ b/tools/render-test/slang-support.cpp
@@ -100,6 +100,7 @@ struct SlangShaderCompilerWrapper : public ShaderCompiler
                 (int)rawTypeNames.Count(),
                 rawTypeNames.Buffer());
 			int compileErr = spCompile(slangRequest);
+            spSetLineDirectiveMode(slangRequest, SLANG_LINE_DIRECTIVE_MODE_NONE);
 			if (auto diagnostics = spGetDiagnosticOutput(slangRequest))
 			{
 				fprintf(stderr, "%s", diagnostics);