1 files changed, 29 insertions, 38 deletions
diff --git a/tools/render-test/options.h b/tools/render-test/options.h
index 8dbff76ea..56bd638ef 100644
--- a/tools/render-test/options.h
+++ b/tools/render-test/options.h
@@ -5,53 +5,44 @@
 
 #include "../../source/core/slang-result.h"
 
-namespace renderer_test {
-
-typedef intptr_t Int;
-typedef uintptr_t UInt;
-
-enum class RendererID
-{
-    NONE,          
-    D3D11,
-    D3D12,
-    GL,
-    VK,
-};
+#include "render.h"
 
-enum class InputLanguageID
-{
-    // Slang being used as an HLSL-ish compiler
-    Slang,
-
-    // Raw HLSL or GLSL input, bypassing Slang
-    Native,
-
-    // Raw HLSL or GLSL input, passed through the Slang rewriter
-    NativeRewrite
-};
-
-enum
-{
-    // maximum number of command-line arguments to pass along to slang
-    kMaxSlangArgs = 16,
-};
-
-enum class ShaderProgramType
-{
-	Graphics,
-	Compute,
-    GraphicsCompute
-};
+namespace renderer_test {
 
 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
+        Slang,
+
+        // Raw HLSL or GLSL input, bypassing Slang
+        Native,
+
+        // Raw HLSL or GLSL input, passed through the Slang rewriter
+        NativeRewrite
+    };
+   
+
+    enum class ShaderProgramType
+    {
+        Graphics,
+        Compute,
+        GraphicsCompute
+    };
+
     char const* appName = "render-test";
     char const* sourcePath = nullptr;
     char const* outputPath = nullptr;
 	ShaderProgramType shaderType = ShaderProgramType::Graphics;
 
-    RendererID rendererID = RendererID::NONE;
+    RendererType rendererType = RendererType::Unknown;
     InputLanguageID inputLanguageID = InputLanguageID::Slang;
 
     char const* slangArgs[kMaxSlangArgs];