[PATCH 0/1] MR165: tests: Pop the shader runner context after processing the current section.

[Giovanni Mascellani (＠giomasce)]

This way failures produced while compiling or preprocessing a shader
are shown with the appropriate context.

[PATCH 1/1] tests: Pop the shader runner context after processing the current section.

[Giovanni Mascellani]

From: Giovanni Mascellani

This way failures produced while compiling or preprocessing a shader
are shown with the appropriate context.
---
 tests/shader_runner.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/shader_runner.c b/tests/shader_runner.c
index 9922496b..7af42552 100644
--- a/tests/shader_runner.c
+++ b/tests/shader_runner.c
@@ -780,9 +780,6 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_o

if (!ret || line[0] == '[')
         {
-            if (state != STATE_NONE)
-                vkd3d_test_pop_context();
-
             switch (state)
             {
                 case STATE_INPUT_LAYOUT:
@@ -884,6 +881,9 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_o
                     break;
                 }
             }
+
+            if (state != STATE_NONE)
+                vkd3d_test_pop_context();
         }

if (!ret)

[PATCH 0/1] MR165: tests: Pop the shader runner context after processing the current section. - approved

[Francisco Casas (＠fcasas)]

This merge request was approved by Francisco Casas.

[Zebediah Figura (＠zfigura)]

This is actually kind of broken as-is, because [require] does an early return without popping the context.