From 98b8e0c809ceab84cee25389e54f3f37d220d95e Mon Sep 17 00:00:00 2001
From: jsmall-nvidia <jsmall@nvidia.com>
Date: Tue, 20 Mar 2018 17:14:12 -0400
Subject: SlangResult and small bug/typos fixes (#448)

* Fixed some small typos in api-users-guide.md

* Fix some small typos in slang-test/main.cpp, render-test/render-d3d11.cpp

* Remove exit() calls from test code. Added Slang::Result, which works in the same way as COM HRESULT.

* FIx bug introduced when moving to Slang::Result - handling E_INVALIDARG on Dx11.

* Fix the testing of feature levels on Dx11 renderer.

* First attempt at README.md for slang-test.

* Tidied up the slang-test README.md file.

* Fix some small typos in tools/slang-test/main.cpp

* Fix spaces -> tabs problems.
Fix some small types.
---
 tools/render-test/options.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'tools/render-test/options.cpp')

diff --git a/tools/render-test/options.cpp b/tools/render-test/options.cpp
index 45a94e137..30aeca6b0 100644
--- a/tools/render-test/options.cpp
+++ b/tools/render-test/options.cpp
@@ -10,7 +10,7 @@ namespace renderer_test {
 
 Options gOptions;
 
-void parseOptions(int* argc, char** argv)
+SlangResult parseOptions(int* argc, char** argv)
 {
     int argCount = *argc;
     char const* const* argCursor = argv;
@@ -48,7 +48,7 @@ void parseOptions(int* argc, char** argv)
             if( argCursor == argEnd )
             {
                 fprintf(stderr, "expected argument for '%s' option\n", arg);
-                exit(1);
+                return SLANG_FAIL;
             }
             gOptions.outputPath = *argCursor++;
         }
@@ -89,12 +89,12 @@ void parseOptions(int* argc, char** argv)
             if( argCursor == argEnd )
             {
                 fprintf(stderr, "expected argument for '%s' option\n", arg);
-                exit(1);
+                return SLANG_FAIL;
             }
             if( gOptions.slangArgCount == kMaxSlangArgs )
             {
                 fprintf(stderr, "maximum number of '%s' options exceeded (%d)\n", arg, kMaxSlangArgs);
-                exit(1);
+                return SLANG_FAIL;
             }
             gOptions.slangArgs[gOptions.slangArgCount++] = *argCursor++;
         }
@@ -123,7 +123,7 @@ void parseOptions(int* argc, char** argv)
         else
         {
             fprintf(stderr, "unknown option '%s'\n", arg);
-            exit(1);
+            return SLANG_FAIL;
         }
     }
     
@@ -142,10 +142,11 @@ void parseOptions(int* argc, char** argv)
     if(argCursor != argEnd)
     {
         fprintf(stderr, "unexpected arguments\n");
-        exit(1);
+        return SLANG_FAIL;
     }
 
     *argc = 0;
+	return SLANG_OK;
 }
 
 } // renderer_test
-- 
cgit v1.2.3