[PATCH 3/4] tests/shader-runner: Allow passing (sm<4) and (sm>=4) to "fail" and "todo" qualifiers.

[Francisco Casas]

From: Francisco Casas

---
 tests/shader_runner.c | 48 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 40 insertions(+), 8 deletions(-)

diff --git a/tests/shader_runner.c b/tests/shader_runner.c
index b9adec8b4..745f17b3a 100644
--- a/tests/shader_runner.c
+++ b/tests/shader_runner.c
@@ -500,6 +500,10 @@ static void parse_test_directive(struct shader_runner *runner, const char *line)

if (match_string(line, "todo", &line))
         runner->is_todo = true;
+    else if (match_string(line, "todo(sm<4)", &line))
+        runner->is_todo = runner->selected_shader_model < SHADER_MODEL_4_0;
+    else if (match_string(line, "todo(sm>=4)", &line))
+        runner->is_todo = runner->selected_shader_model >= SHADER_MODEL_4_0;
     else if (match_string(line, "todo(sm<6)", &line))
         runner->is_todo = runner->selected_shader_model < SHADER_MODEL_6_0;
     else if (match_string(line, "todo(sm>=6)", &line))
@@ -996,6 +1000,18 @@ static void compile_shader(struct shader_runner *runner, IDxcCompiler3 *dxc_comp
     }
 }

+static enum parse_state get_parse_state_todo(enum parse_state state)
+{
+    if (state == STATE_SHADER_COMPUTE)
+        return STATE_SHADER_COMPUTE_TODO;
+    else if (state == STATE_SHADER_PIXEL)
+        return STATE_SHADER_PIXEL_TODO;
+    else if (state == STATE_SHADER_VERTEX)
+        return STATE_SHADER_VERTEX_TODO;
+    else
+        return STATE_SHADER_EFFECT_TODO;
+}
+
 static enum parse_state read_shader_directive(struct shader_runner *runner, enum parse_state state, const char *line,
         const char *src, HRESULT *expect_hr)
 {
@@ -1006,19 +1022,35 @@ static enum parse_state read_shader_directive(struct shader_runner *runner, enum
         {
             if (runner->selected_shader_model >= SHADER_MODEL_6_0)
                 continue;
-            if (state == STATE_SHADER_COMPUTE)
-                state = STATE_SHADER_COMPUTE_TODO;
-            else if (state == STATE_SHADER_PIXEL)
-                state = STATE_SHADER_PIXEL_TODO;
-            else if (state == STATE_SHADER_VERTEX)
-                state = STATE_SHADER_VERTEX_TODO;
-            else
-                state = STATE_SHADER_EFFECT_TODO;
+            state = get_parse_state_todo(state);
+        }
+        else if (match_directive_substring(src, "todo(sm<4)", &src))
+        {
+            if (runner->selected_shader_model >= SHADER_MODEL_4_0)
+                continue;
+            state = get_parse_state_todo(state);
+        }
+        else if (match_directive_substring(src, "todo(sm>=4)", &src))
+        {
+            if (runner->selected_shader_model >= SHADER_MODEL_6_0
+                    || runner->selected_shader_model < SHADER_MODEL_4_0)
+                continue;
+            state = get_parse_state_todo(state);
         }
         else if (match_directive_substring(src, "fail", &src))
         {
             *expect_hr = E_FAIL;
         }
+        else if (match_directive_substring(src, "fail(sm<4)", &src))
+        {
+            if (runner->selected_shader_model < SHADER_MODEL_4_0)
+                *expect_hr = E_FAIL;
+        }
+        else if (match_directive_substring(src, "fail(sm>=4)", &src))
+        {
+            if (runner->selected_shader_model >= SHADER_MODEL_4_0)
+                *expect_hr = E_FAIL;
+        }
         else if (match_directive_substring(src, "fail(sm<6)", &src))
         {
             if (runner->selected_shader_model < SHADER_MODEL_6_0)