1 files changed, 10 insertions, 16 deletions

diff --git a/tools/render-test/options.h b/tools/render-test/options.h
index 2945113fe..7940d0d42 100644
--- a/tools/render-test/options.h
+++ b/tools/render-test/options.h
@@ -12,6 +12,8 @@
 
 #include "../../source/core/slang-process-util.h"
 
+#include "../../source/compiler-core/slang-command-line-args.h"
+
 #include "../../slang-gfx.h"
 
 namespace renderer_test {
@@ -20,12 +22,6 @@ using namespace gfx;
 
 struct Options
 {
-    enum
-    {
-        // maximum number of command-line arguments to pass along to slang
-        kMaxSlangArgs = 16,
-    };
-
     enum class InputLanguageID
     {
         // Slang being used as an HLSL-ish compiler
@@ -35,7 +31,6 @@ struct Options
         Native,
     };
 
-
     enum class ShaderProgramType
     {
         Graphics,
@@ -44,9 +39,9 @@ struct Options
         RayTracing,
     };
 
-    char const* appName = "render-test";
-    char const* sourcePath = nullptr;
-    char const* outputPath = nullptr;
+    Slang::String appName = "render-test";
+    Slang::String sourcePath;
+    Slang::String outputPath;
 	ShaderProgramType shaderType = ShaderProgramType::Graphics;
 
         /// The renderer type inferred from the target language type. Used if a rendererType is not explicitly set.
@@ -57,10 +52,7 @@ struct Options
     SlangSourceLanguage sourceLanguage = SLANG_SOURCE_LANGUAGE_UNKNOWN;
 
         /// Can be used for overriding the profile
-    const char* profileName = nullptr;
-
-    char const* slangArgs[kMaxSlangArgs];
-    int slangArgCount = 0;
+    Slang::String profileName;
 
     bool outputUsingType = false;
 
@@ -73,14 +65,16 @@ struct Options
 
     Slang::List<Slang::String> renderFeatures;          /// Required render features for this test to run
 
-    Slang::List<Slang::String> compileArgs;
-
     Slang::String adapter;                              ///< The adapter to use either name or index
 
     uint32_t computeDispatchSize[3] = { 1, 1, 1 };
 
     Slang::String nvapiExtnSlot;                               ///< The nvapiRegister to use.
 
+    Slang::DownstreamArgs downstreamArgs;                    ///< Args to downstream tools. Here it's just slang
+
+    Options() { downstreamArgs.addName("slang"); }
+
     static SlangResult parse(int argc, const char*const* argv, Slang::WriterHelper stdError, Options& outOptions);
 };