From 31136ead05c5a0afe8c83da9a5c63d60b5e6fb49 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Thu, 21 Aug 2025 11:43:41 +0200 Subject: [PATCH] tests/shader_runner: Use read_f32() to parse "uniform" directives. --- tests/hlsl/rcp.shader_test | 4 ++-- tests/shader_runner.c | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/hlsl/rcp.shader_test b/tests/hlsl/rcp.shader_test index 51753d198..8627ce51f 100644 --- a/tests/hlsl/rcp.shader_test +++ b/tests/hlsl/rcp.shader_test @@ -24,7 +24,7 @@ draw quad probe (0, 0) rgba (4.0, 8.0, 16.0, 3.0) 8 % Degenerate cases -uniform 0 float4 0.0 -0.0 1.0e39 -1.0e39 +uniform 0 float4 0.0 -0.0 INF -INF draw quad probe (0, 0) rgba (1.0e39, -1.0e39, 0.0, -0.0) 8 @@ -47,7 +47,7 @@ uniform 0 float4 7.604 3.1415 2.72 9.876 draw quad probe (0, 0) rgba (7.604, 3.1415, 2.72, 9.876) 8 -uniform 0 float4 0.0 -0.0 1.0e39 -1.0e39 +uniform 0 float4 0.0 -0.0 INF -INF draw quad probe (0, 0) rgba (0.0, -0.0, 1.0e39, -1.0e39) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index c94faf6b7..fbdae1b94 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -1442,16 +1442,17 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) { struct vec4 v; - if (sscanf(line, "%f %f %f %f", &v.x, &v.y, &v.z, &v.w) < 4) - fatal_error("Malformed float4 constant '%s'.\n", line); + read_f32(&line, &v.x); + read_f32(&line, &v.y); + read_f32(&line, &v.z); + read_f32(&line, &v.w); set_uniforms(runner, offset, 4, &v); } else if (match_string(line, "float", &line)) { float f; - if (sscanf(line, "%f", &f) < 1) - fatal_error("Malformed float constant '%s'.\n", line); + read_f32(&line, &f); set_uniforms(runner, offset, 1, &f); } else if (match_string(line, "double2", &line))