January 2024 - Wine-commits

Zebediah Figura : tests: Test signature reflection via D3DReflect().
by Alexandre Julliard 24 Jan '24

24 Jan '24

Module: vkd3d Branch: master Commit: 0f46e7bbadcaf48b348eefc9499e353b11566327 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0f46e7bbadcaf48b348eefc9499e3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jan 6 19:02:43 2024 -0600 tests: Test signature reflection via D3DReflect(). Ported from Wine. --- include/vkd3d_d3dcompiler.h | 1 + tests/hlsl_d3d12.c | 199 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 200 insertions(+)

1 0

Conor McCarthy : vkd3d-shader/dxil: Handle floating point special value comparisons in sm6_parser_emit_dx_unary().
by Alexandre Julliard 24 Jan '24

24 Jan '24

Module: vkd3d Branch: master Commit: 41cce4cbf1c94365975ce742ddf3b61f7c22d11f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/41cce4cbf1c94365975ce742ddf3b… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Jan 22 15:18:27 2024 +1000 vkd3d-shader/dxil: Handle floating point special value comparisons in sm6_parser_emit_dx_unary(). --- libs/vkd3d-shader/d3d_asm.c | 3 +++ libs/vkd3d-shader/dxil.c | 15 +++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 3 +++ 3 files changed, 21 insertions(+) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index d9751945..6ec7a9c9 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -198,8 +198,11 @@ static const char * const shader_opcode_names[] = [VKD3DSIH_IMUL ] = "imul", [VKD3DSIH_INE ] = "ine", [VKD3DSIH_INEG ] = "ineg", + [VKD3DSIH_ISFINITE ] = "isfinite", [VKD3DSIH_ISHL ] = "ishl", [VKD3DSIH_ISHR ] = "ishr", + [VKD3DSIH_ISINF ] = "isinf", + [VKD3DSIH_ISNAN ] = "isnan", [VKD3DSIH_ITOD ] = "itod", [VKD3DSIH_ITOF ] = "itof", [VKD3DSIH_ITOI ] = "itoi", diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 2a0ff61c..c089d132 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -328,6 +328,9 @@ enum dx_intrinsic_opcode { DX_LOAD_INPUT = 4, DX_STORE_OUTPUT = 5, + DX_ISNAN = 8, + DX_ISINF = 9, + DX_ISFINITE = 10, DX_EXP = 21, DX_FRC = 22, DX_LOG = 23, @@ -3494,6 +3497,12 @@ static enum vkd3d_shader_opcode map_dx_unary_op(enum dx_intrinsic_opcode op) { switch (op) { + case DX_ISNAN: + return VKD3DSIH_ISNAN; + case DX_ISINF: + return VKD3DSIH_ISINF; + case DX_ISFINITE: + return VKD3DSIH_ISFINITE; case DX_EXP: return VKD3DSIH_EXP; case DX_FRC: @@ -3806,6 +3815,7 @@ struct sm6_dx_opcode_info }; /* + 1 -> int1 8 -> int8 b -> constant int1 c -> constant int8/16/32 @@ -3839,6 +3849,9 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_FRC ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_IMAX ] = {"m", "RR", sm6_parser_emit_dx_binary}, [DX_IMIN ] = {"m", "RR", sm6_parser_emit_dx_binary}, + [DX_ISFINITE ] = {"1", "g", sm6_parser_emit_dx_unary}, + [DX_ISINF ] = {"1", "g", sm6_parser_emit_dx_unary}, + [DX_ISNAN ] = {"1", "g", sm6_parser_emit_dx_unary}, [DX_LEGACY_F16TOF32 ] = {"f", "i", sm6_parser_emit_dx_unary}, [DX_LEGACY_F32TOF16 ] = {"i", "f", sm6_parser_emit_dx_unary}, [DX_LOAD_INPUT ] = {"o", "ii8i", sm6_parser_emit_dx_load_input}, @@ -3867,6 +3880,8 @@ static bool sm6_parser_validate_operand_type(struct sm6_parser *sm6, const struc case 0: FIXME("Invalid operand count.\n"); return false; + case '1': + return sm6_type_is_bool(type); case '8': return sm6_type_is_i8(type); case 'b': diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 03d95472..51daf215 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -392,8 +392,11 @@ enum vkd3d_shader_opcode VKD3DSIH_IMUL, VKD3DSIH_INE, VKD3DSIH_INEG, + VKD3DSIH_ISFINITE, VKD3DSIH_ISHL, VKD3DSIH_ISHR, + VKD3DSIH_ISINF, + VKD3DSIH_ISNAN, VKD3DSIH_ITOD, VKD3DSIH_ITOF, VKD3DSIH_ITOI,

1 0

Conor McCarthy : tests/shader-runner: Add tests for floating point special values.
by Alexandre Julliard 24 Jan '24

24 Jan '24

Module: vkd3d Branch: master Commit: 35d46cf3d966384a5bfda41be384455622910a96 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/35d46cf3d966384a5bfda41be3844… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Jan 22 23:51:30 2024 +1000 tests/shader-runner: Add tests for floating point special values. --- tests/hlsl/float-comparison.shader_test | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/tests/hlsl/float-comparison.shader_test b/tests/hlsl/float-comparison.shader_test index 7109f9af..9bbd493f 100644 --- a/tests/hlsl/float-comparison.shader_test +++ b/tests/hlsl/float-comparison.shader_test @@ -65,3 +65,32 @@ shader model >= 6.0 uniform 0 float4 0.0 1.5 1.5 0.0 draw quad probe all rgba (1010101.0, 11110000.0, 1101001.0, 0.0) + + +[pixel shader] +uniform float4 f; + +float4 main() : sv_target +{ + float4 result = float4(isinf(f.x / f.y), isnan(sqrt(f.w)), isinf(sqrt(f.w)), isnan(f.x / f.y)); + return result + float4(isinf(f.x / f.z), isnan(sqrt(f.y)), isinf(f.y / f.z), isnan(sqrt(f.z))) * 10.0; +} + +[test] +uniform 0 float4 1.5 0.0 1.0 -1.0 +todo draw quad +probe all rgba (1.0, 1.0, 0.0, 0.0) + + +[pixel shader] +uniform float4 f; + +float4 main() : sv_target +{ + return float4(isfinite(f.x / f.y), isfinite(sqrt(f.w)), isfinite(f.x / f.z), 0.0); +} + +[test] +uniform 0 float4 1.5 0.0 1.0 -1.0 +todo draw quad +probe all rgba (0.0, 0.0, 1.0, 0.0)

1 0

Conor McCarthy : vkd3d-shader/spirv: Implement the ISFINITE instruction.
by Alexandre Julliard 24 Jan '24

24 Jan '24

Module: vkd3d Branch: master Commit: cd674d593e8c166b6e3eea9ee75b024f2ee7f259 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cd674d593e8c166b6e3eea9ee75b0… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Jan 22 15:57:27 2024 +1000 vkd3d-shader/spirv: Implement the ISFINITE instruction. --- libs/vkd3d-shader/spirv.c | 39 +++++++++++++++++++++++++++++++++ tests/hlsl/float-comparison.shader_test | 2 +- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d511b4a1..2d632937 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1515,6 +1515,25 @@ static uint32_t vkd3d_spirv_build_op_uless_than_equal(struct vkd3d_spirv_builder SpvOpULessThanEqual, result_type, operand0, operand1); } +static uint32_t vkd3d_spirv_build_op_is_inf(struct vkd3d_spirv_builder *builder, + uint32_t result_type, uint32_t operand) +{ + return vkd3d_spirv_build_op_tr1(builder, &builder->function_stream, SpvOpIsInf, result_type, operand); +} + +static uint32_t vkd3d_spirv_build_op_is_nan(struct vkd3d_spirv_builder *builder, + uint32_t result_type, uint32_t operand) +{ + return vkd3d_spirv_build_op_tr1(builder, &builder->function_stream, SpvOpIsNan, result_type, operand); +} + +static uint32_t vkd3d_spirv_build_op_logical_equal(struct vkd3d_spirv_builder *builder, + uint32_t result_type, uint32_t operand0, uint32_t operand1) +{ + return vkd3d_spirv_build_op_tr2(builder, &builder->function_stream, + SpvOpLogicalEqual, result_type, operand0, operand1); +} + static uint32_t vkd3d_spirv_build_op_convert_utof(struct vkd3d_spirv_builder *builder, uint32_t result_type, uint32_t unsigned_value) { @@ -6896,6 +6915,23 @@ static enum vkd3d_result spirv_compiler_emit_alu_instruction(struct spirv_compil return VKD3D_OK; } +static void spirv_compiler_emit_isfinite(struct spirv_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_dst_param *dst = instruction->dst; + const struct vkd3d_shader_src_param *src = instruction->src; + uint32_t type_id, src_id, isinf_id, isnan_id, val_id; + + type_id = spirv_compiler_get_type_id_for_dst(compiler, dst); + src_id = spirv_compiler_emit_load_src(compiler, src, dst->write_mask); + /* OpIsFinite is only available in Kernel mode. */ + isinf_id = vkd3d_spirv_build_op_is_inf(builder, type_id, src_id); + isnan_id = vkd3d_spirv_build_op_is_nan(builder, type_id, src_id); + val_id = vkd3d_spirv_build_op_logical_equal(builder, type_id, isinf_id, isnan_id); + spirv_compiler_emit_store_dst(compiler, dst, val_id); +} + static enum GLSLstd450 spirv_compiler_map_ext_glsl_instruction( const struct vkd3d_shader_instruction *instruction) { @@ -9465,6 +9501,9 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, case VKD3DSIH_XOR: ret = spirv_compiler_emit_alu_instruction(compiler, instruction); break; + case VKD3DSIH_ISFINITE: + spirv_compiler_emit_isfinite(compiler, instruction); + break; case VKD3DSIH_DFMA: case VKD3DSIH_DMAX: case VKD3DSIH_DMIN: diff --git a/tests/hlsl/float-comparison.shader_test b/tests/hlsl/float-comparison.shader_test index 9bbd493f..9cab3442 100644 --- a/tests/hlsl/float-comparison.shader_test +++ b/tests/hlsl/float-comparison.shader_test @@ -92,5 +92,5 @@ float4 main() : sv_target [test] uniform 0 float4 1.5 0.0 1.0 -1.0 -todo draw quad +draw quad probe all rgba (0.0, 0.0, 1.0, 0.0)

1 0

Conor McCarthy : vkd3d-shader/spirv: Handle the ISINF and ISNAN instructions in spirv_compiler_emit_alu_instruction().
by Alexandre Julliard 24 Jan '24

24 Jan '24

Module: vkd3d Branch: master Commit: e973271a40676c19f2b842befdc9f15c593fe8ef URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e973271a40676c19f2b842befdc9f… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Jan 22 15:59:22 2024 +1000 vkd3d-shader/spirv: Handle the ISINF and ISNAN instructions in spirv_compiler_emit_alu_instruction(). --- libs/vkd3d-shader/spirv.c | 4 ++++ tests/hlsl/float-comparison.shader_test | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 2d632937..b6dadeda 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6768,6 +6768,8 @@ static SpvOp spirv_compiler_map_alu_instruction(const struct vkd3d_shader_instru {VKD3DSIH_INEG, SpvOpSNegate}, {VKD3DSIH_ISHL, SpvOpShiftLeftLogical}, {VKD3DSIH_ISHR, SpvOpShiftRightArithmetic}, + {VKD3DSIH_ISINF, SpvOpIsInf}, + {VKD3DSIH_ISNAN, SpvOpIsNan}, {VKD3DSIH_ITOD, SpvOpConvertSToF}, {VKD3DSIH_ITOF, SpvOpConvertSToF}, {VKD3DSIH_ITOI, SpvOpSConvert}, @@ -9488,6 +9490,8 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, case VKD3DSIH_INEG: case VKD3DSIH_ISHL: case VKD3DSIH_ISHR: + case VKD3DSIH_ISINF: + case VKD3DSIH_ISNAN: case VKD3DSIH_ITOD: case VKD3DSIH_ITOF: case VKD3DSIH_ITOI: diff --git a/tests/hlsl/float-comparison.shader_test b/tests/hlsl/float-comparison.shader_test index 9cab3442..b6654344 100644 --- a/tests/hlsl/float-comparison.shader_test +++ b/tests/hlsl/float-comparison.shader_test @@ -78,7 +78,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.5 0.0 1.0 -1.0 -todo draw quad +draw quad probe all rgba (1.0, 1.0, 0.0, 0.0)

1 0

Conor McCarthy : vkd3d-shader: Introduce VKD3D_SHADER_COMPILE_OPTION_FEATURE_FLOAT64.
by Alexandre Julliard 24 Jan '24

24 Jan '24

Module: vkd3d Branch: master Commit: 6446b6ea21568ccb92d01cc622b78f3179a8444d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6446b6ea21568ccb92d01cc622b78… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jan 23 12:59:21 2024 +1000 vkd3d-shader: Introduce VKD3D_SHADER_COMPILE_OPTION_FEATURE_FLOAT64. --- include/vkd3d_shader.h | 1 + libs/vkd3d/state.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 449b3684..a8cc3a33 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -200,6 +200,7 @@ enum vkd3d_shader_compile_option_fragment_coordinate_origin enum vkd3d_shader_compile_option_feature_flags { VKD3D_SHADER_COMPILE_OPTION_FEATURE_INT64 = 0x00000001, + VKD3D_SHADER_COMPILE_OPTION_FEATURE_FLOAT64 = 0x00000002, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILE_OPTION_FEATURE_FLAGS), }; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 82782e7d..12a8cd54 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2154,6 +2154,8 @@ static unsigned int feature_flags_compile_option(const struct d3d12_device *devi if (device->feature_options1.Int64ShaderOps) flags |= VKD3D_SHADER_COMPILE_OPTION_FEATURE_INT64; + if (device->feature_options.DoublePrecisionFloatShaderOps) + flags |= VKD3D_SHADER_COMPILE_OPTION_FEATURE_FLOAT64; return flags; }

1 0

Conor McCarthy : vkd3d-shader/spirv: Check for FEATURE_FLOAT64 when double precision use is flagged.
by Alexandre Julliard 24 Jan '24

24 Jan '24

Module: vkd3d Branch: master Commit: 54f6e6dd67800ee9fd58ba1585aa9e73ba60376b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/54f6e6dd67800ee9fd58ba1585aa9… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jan 23 13:00:22 2024 +1000 vkd3d-shader/spirv: Check for FEATURE_FLOAT64 when double precision use is flagged. --- libs/vkd3d-shader/spirv.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index b6dadeda..299b4e96 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2369,6 +2369,7 @@ struct spirv_compiler size_t spec_constants_size; enum vkd3d_shader_compile_option_formatting_flags formatting; enum vkd3d_shader_compile_option_feature_flags features; + enum vkd3d_shader_api_version api_version; bool write_tess_geom_point_size; struct vkd3d_string_buffer_cache string_buffers; @@ -2513,6 +2514,7 @@ static struct spirv_compiler *spirv_compiler_create(const struct vkd3d_shader_ve break; case VKD3D_SHADER_COMPILE_OPTION_API_VERSION: + compiler->api_version = option->value; break; case VKD3D_SHADER_COMPILE_OPTION_TYPED_UAV: @@ -2547,6 +2549,10 @@ static struct spirv_compiler *spirv_compiler_create(const struct vkd3d_shader_ve } } + /* Explicit enabling of float64 was not required for API versions <= 1.10. */ + if (compiler->api_version <= VKD3D_SHADER_API_VERSION_1_10) + compiler->features |= VKD3D_SHADER_COMPILE_OPTION_FEATURE_FLOAT64; + rb_init(&compiler->symbol_table, vkd3d_symbol_compare); compiler->shader_type = shader_version->type; @@ -5601,7 +5607,16 @@ static void spirv_compiler_emit_dcl_global_flags(struct spirv_compiler *compiler if (flags & (VKD3DSGF_ENABLE_DOUBLE_PRECISION_FLOAT_OPS | VKD3DSGF_ENABLE_11_1_DOUBLE_EXTENSIONS)) { - vkd3d_spirv_enable_capability(&compiler->spirv_builder, SpvCapabilityFloat64); + if (compiler->features & VKD3D_SHADER_COMPILE_OPTION_FEATURE_FLOAT64) + { + vkd3d_spirv_enable_capability(&compiler->spirv_builder, SpvCapabilityFloat64); + } + else + { + WARN("Unsupported 64-bit float ops.\n"); + spirv_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_UNSUPPORTED_FEATURE, + "The target environment does not support 64-bit floating point."); + } flags &= ~(VKD3DSGF_ENABLE_DOUBLE_PRECISION_FLOAT_OPS | VKD3DSGF_ENABLE_11_1_DOUBLE_EXTENSIONS); }

1 0

Brendan Shanks : ntdll: Remove unnecessary NtQueryVirtualMemory call.
by Alexandre Julliard 24 Jan '24

24 Jan '24

Module: wine Branch: master Commit: fe880597a1c38bba761950b5cf533f80814df41c URL: https://gitlab.winehq.org/wine/wine/-/commit/fe880597a1c38bba761950b5cf533f… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Jan 23 15:19:28 2024 -0800 ntdll: Remove unnecessary NtQueryVirtualMemory call. --- dlls/ntdll/loader.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 021f7941969..8030e3b7892 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4255,14 +4255,10 @@ void loader_init( CONTEXT *context, void **entry ) if (!imports_fixup_done) { - MEMORY_BASIC_INFORMATION meminfo; ANSI_STRING ctrl_routine = RTL_CONSTANT_STRING( "CtrlRoutine" ); WINE_MODREF *kernel32; PEB *peb = NtCurrentTeb()->Peb; - NtQueryVirtualMemory( GetCurrentProcess(), LdrInitializeThunk, MemoryBasicInformation, - &meminfo, sizeof(meminfo), NULL ); - peb->LdrData = &ldr; peb->FastPebLock = &peb_lock; peb->TlsBitmap = &tls_bitmap;

1 0

Brendan Shanks : ntdll: Only build the main module and ntdll once on Wow64.
by Alexandre Julliard 24 Jan '24

24 Jan '24

Module: wine Branch: master Commit: c98d0eaac82934c848d9894930512eb4a3ab82c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/c98d0eaac82934c848d9894930512e… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Jan 23 15:20:06 2024 -0800 ntdll: Only build the main module and ntdll once on Wow64. Fixes +relay for applications that use multiple threads when running in new Wow64. --- dlls/ntdll/loader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 8030e3b7892..4fc8af2662e 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4131,9 +4131,6 @@ void (WINAPI *pWow64PrepareForException)( EXCEPTION_RECORD *rec, CONTEXT *contex static void init_wow64( CONTEXT *context ) { - build_wow64_main_module(); - build_ntdll_module(); - if (!imports_fixup_done) { HMODULE wow64; @@ -4141,6 +4138,9 @@ static void init_wow64( CONTEXT *context ) NTSTATUS status; static const WCHAR wow64_path[] = L"C:\\windows\\system32\\wow64.dll"; + build_wow64_main_module(); + build_ntdll_module(); + if ((status = load_dll( NULL, wow64_path, 0, &wm, FALSE ))) { ERR( "could not load %s, status %lx\n", debugstr_w(wow64_path), status );

1 0

Francisco Casas : tests/shader-runner: Support reading multiple model range args for qualifiers.
by Alexandre Julliard 24 Jan '24

24 Jan '24

Module: vkd3d Branch: master Commit: 79de3ec766138a0396289cf56b8bdd354835a02c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/79de3ec766138a0396289cf56b8bd… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Nov 10 18:37:40 2023 -0300 tests/shader-runner: Support reading multiple model range args for qualifiers. We can now pass (sm<4) and (sm>=4) to "fail" and "todo" qualifiers, and we can use multiple of these qualifier arguments using "&" for AND and "|" for OR. examples: todo(sm>=4 & sm<6) todo(sm<4 | sm>6) parenthesis are not supported. Adding additional model ranges for the tests, if we need them, should be easier now, since they only have to be added to the "valid_args" array. --- tests/shader_runner.c | 184 ++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 139 insertions(+), 45 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index bac3a8f2..0bf5e09f 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -94,40 +94,139 @@ enum parse_state STATE_TEST, }; -static bool match_string(const char *line, const char *token, const char **const rest) +static bool check_qualifier_args_conjunction(const char *line, + const char **const rest, enum shader_model sm) { - size_t len = strlen(token); + bool holds = true; + unsigned int i; - while (isspace(*line)) - ++line; + static const struct + { + const char *text; + enum shader_model sm_min, sm_max; + } + valid_args[] = + { + {"sm>=4", SHADER_MODEL_4_0, SHADER_MODEL_6_0}, + {"sm>=6", SHADER_MODEL_6_0, SHADER_MODEL_6_0}, + {"sm<4", SHADER_MODEL_2_0, SHADER_MODEL_4_0 - 1}, + {"sm<6", SHADER_MODEL_2_0, SHADER_MODEL_6_0 - 1}, + }; - if (strncmp(line, token, len) || !isspace(line[len])) - return false; + while (*line != ')' && *line != '|') + { + bool match = false; + + while (isspace(*line)) + ++line; + + for (i = 0; i < ARRAY_SIZE(valid_args); ++i) + { + const char *option_text = valid_args[i].text; + + if (!strncmp(line, option_text, strlen(option_text))) + { + line += strlen(option_text); + if (sm < valid_args[i].sm_min) + holds = false; + if (sm > valid_args[i].sm_max) + holds = false; + + match = true; + break; + } + } + + while (isspace(*line)) + ++line; + + if (match && *line == '&') + { + ++line; + } + else if (*line != ')' && *line != '|') + { + fatal_error("Invalid qualifier argument '%s'.\n", line); + } + } + + assert(*line == ')' || *line == '|'); if (rest) + *rest = line; + + return holds; +} + +static bool check_qualifier_args(const char *line, const char **const rest, enum shader_model sm) +{ + bool first = true; + bool holds = false; + + assert(*line == '('); + ++line; + + while (*line != ')') { - *rest = line + len; - while (isspace(**rest)) - ++*rest; + if (!first && *line == '|') + ++line; + first = false; + + holds = check_qualifier_args_conjunction(line, &line, sm) || holds; } - return true; + + assert(*line == ')'); + if (rest) + *rest = line + 1; + + return holds; } -static bool match_directive_substring(const char *line, const char *token, const char **const rest) +static bool match_string_generic(const char *line, const char *token, const char **const rest, + bool exclude_bracket, bool allow_qualifier_args, enum shader_model sm) { size_t len = strlen(token); + bool holds = true; - while (isspace(*line) || *line == ']') + while (isspace(*line) || (exclude_bracket && *line == ']')) ++line; - if (strncmp(line, token, len) || !(isspace(line[len]) || line[len] == ']')) + if (strncmp(line, token, len) || !(isspace(line[len]) || line[len] == '(' + || (exclude_bracket && line[len] == ']'))) return false; + line += len; + + if (allow_qualifier_args && *line == '(') + holds = check_qualifier_args(line, &line, sm); + if (rest) { - *rest = line + len; + *rest = line; while (isspace(**rest)) ++*rest; } - return true; + return holds; +} + +static bool match_string_with_args(const char *line, const char *token, const char **const rest, + enum shader_model sm) +{ + return match_string_generic(line, token, rest, false, true, sm); +} + +static bool match_string(const char *line, const char *token, const char **const rest) +{ + return match_string_generic(line, token, rest, false, false, 0); +} + +static bool match_directive_substring_with_args(const char *line, const char *token, + const char **const rest, enum shader_model sm) +{ + return match_string_generic(line, token, rest, true, true, sm); +} + +static bool match_directive_substring(const char *line, const char *token, const char **const rest) +{ + return match_string_generic(line, token, rest, true, false, 0); } static void parse_require_directive(struct shader_runner *runner, const char *line) @@ -548,12 +647,10 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) runner->is_todo = false; - if (match_string(line, "todo", &line)) + if (match_string_with_args(line, "todo", &line, runner->minimum_shader_model)) + { runner->is_todo = true; - else if (match_string(line, "todo(sm<6)", &line)) - runner->is_todo = runner->minimum_shader_model < SHADER_MODEL_6_0; - else if (match_string(line, "todo(sm>=6)", &line)) - runner->is_todo = runner->minimum_shader_model >= SHADER_MODEL_6_0; + } if (match_string(line, "dispatch", &line)) { @@ -1068,45 +1165,42 @@ 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) { while (*src && *src != ']') { - /* 'todo' is not meaningful when dxcompiler is in use, so it has no '(sm<6) qualifier. */ - if (match_directive_substring(src, "todo", &src)) + const char *src_start = src; + + if (match_directive_substring_with_args(src, "todo", &src, runner->minimum_shader_model)) { + /* 'todo' is not meaningful when dxcompiler is in use. */ if (runner->minimum_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, "fail", &src)) + else if (match_directive_substring_with_args(src, "fail", &src, runner->minimum_shader_model)) { *expect_hr = E_FAIL; } - else if (match_directive_substring(src, "fail(sm<6)", &src)) - { - if (runner->minimum_shader_model < SHADER_MODEL_6_0) - *expect_hr = E_FAIL; - } - else if (match_directive_substring(src, "fail(sm>=6)", &src)) - { - if (runner->minimum_shader_model >= SHADER_MODEL_6_0) - *expect_hr = E_FAIL; - } - else if (match_directive_substring(src, "notimpl(sm<6)", &src)) + else if (match_directive_substring_with_args(src, "notimpl", &src, runner->minimum_shader_model)) { - if (runner->minimum_shader_model < SHADER_MODEL_6_0) - *expect_hr = E_NOTIMPL; + *expect_hr = E_NOTIMPL; } - else + + if (src == src_start) { fatal_error("Malformed line '%s'.\n", line); }

1 0