April 2024 - Wine-gitlab - list.winehq.org

Re: [PATCH v3 0/5] MR781: Avoid HLSL_CLASS_OBJECT, part 4.
by Giovanni Mascellani (＠giomasce) 16 Apr '24

16 Apr '24

Giovanni Mascellani (@giomasce) commented about libs/vkd3d-shader/hlsl.c: > return type->reg_size[regset]; > } > > +static struct hlsl_type *hlsl_new_simple_type(struct hlsl_ctx *ctx, const char *name, enum hlsl_type_class class) > +{ > + struct hlsl_type *type; > + > + if (!(type = hlsl_alloc(ctx, sizeof(*type)))) > + return NULL; > + if (!(type->name = hlsl_strdup(ctx, name))) > + { > + vkd3d_free(type); > + return NULL; > + } > + type->class = class; This doesn't set `dimx` and `dimy`, while in the documentation for `struct hlsl_type` we specify them for all classes. Either relaxing the specification or setting them here is fine for me, but at least one of those should happen, I think. -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/781#note_67910

1 0

Re: [PATCH v3 0/5] MR781: Avoid HLSL_CLASS_OBJECT, part 4.
by Giovanni Mascellani (＠giomasce) 16 Apr '24

16 Apr '24

Giovanni Mascellani (@giomasce) commented about libs/vkd3d-shader/d3dbc.c: > return D3DXPC_STRUCT; > case HLSL_CLASS_VECTOR: > return D3DXPC_VECTOR; > - default: > - ERR("Invalid class %#x.\n", type->class); > - vkd3d_unreachable(); > + case HLSL_CLASS_VOID: > + /* This shouldn't happen. */ Is the comment useful? Doesn't the following `vkd3d_unreachable()` already convey that information? Also, could you please add a `break`? clang seems to be touchy about it: ``` ../libs/vkd3d-shader/d3dbc.c:1521:30: error: label at end of compound statement: expected statement case HLSL_CLASS_VOID: ^ ; 1 error generated. make[1]: *** [libs/vkd3d-shader/libvkd3d_shader_la-d3dbc.lo] Error 1 ``` -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/781#note_67909

1 0

[PATCH v4 0/10] MR768: Draft: vkd3d-shader/dxil: Tessellation part 2.
by Conor McCarthy (＠cmccarthy) 16 Apr '24

16 Apr '24

Goes atop !767. The last five commits belong here. -- v4: vkd3d-shader/dxil: Implement DX intrinsic OutputControlPointID. vkd3d-shader/dxil: Implement DX intrinsic DomainLocation. vkd3d-shader/dxil: Implement DX intrinsic StorePatchConstant. vkd3d-shader/dxil: Implement DX intrinsics LoadOutputControlPoint and LoadPatchConstant. vkd3d-shader/dxil: Support patch constant functions and signatures. vkd3d-shader/ir: Validate tessellation declarations. vkd3d-shader/dxil: Implement DX intrinsic PrimitiveID. vkd3d-shader/dxil: Load hull shader properties. vkd3d-shader/dxil: Load domain shader properties. tests/hlsl: Add a tessellation test. https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/768

2 10

[PATCH v3 0/3] MR776: vkd3d-shader: Introduce SPIRV_ENVIRONMENT_VULKAN_1_1.
by Conor McCarthy (＠cmccarthy) 16 Apr '24

16 Apr '24

Shader Model 6 wave ops require instructions not available by extension in SPIR-V 1.0, and device support info is found in VkPhysicalDeviceSubgroupProperties, which also has no equivalent by extension in Vulkan 1.0. -- v3: vkd3d-shader: Introduce a wave ops feature flag. vkd3d: Use Vulkan 1.1 if available. vkd3d-shader: Introduce SPIRV_ENVIRONMENT_VULKAN_1_1. https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/776

2 3

[PATCH v2 0/1] MR795: tests/hlsl: Add wave op tests.
by Conor McCarthy (＠cmccarthy) 16 Apr '24

16 Apr '24

-- v2: tests/hlsl: Add wave op tests. https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/795

2 1

[PATCH 0/4] MR795: tests/hlsl: Add wave op tests.
by Conor McCarthy (＠cmccarthy) 16 Apr '24

16 Apr '24

-- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/795

3 4

[PATCH v2 0/3] MR785: vkd3d-shader/ir: Only emit trampolines and launchers when needed.
by Giovanni Mascellani (＠giomasce) 16 Apr '24

16 Apr '24

~~This goes atop !773. The last three commits belong to this MR.~~ Trampolines and launchers allow us to handle code doing multilevel jumps, but they partially virtualize the control flow, which potentially makes the jobs of downstream compilers harder. So we avoid them every time we can. -- v2: vkd3d-shader/ir: Only emit launchers when needed. vkd3d-shader/ir: Only emit trampolines when needed. vkd3d-shader/ir: Swap selection branches if the if branch is empty. https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/785

3 4

[PATCH v3 0/5] MR684: tests/shader-runner: Improve test coverage.
by Conor McCarthy (＠cmccarthy) 16 Apr '24

16 Apr '24

These tests cover code paths untested in DXIL, except for the last commit which is to catch any signed int resource issues. -- v3: tests/hlsl: Add tests for texture UAV signed atomics. tests/hlsl: Add tests for texture UAV atomics. tests/hlsl: Add a test for UAV InterlockedExchange(). tests/hlsl: Add a test for a structured UAV scalar store. tests/hlsl: Add tests for min() and integer max(). https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/684

2 6

[PATCH v8 0/5] MR767: vkd3d-shader/dxil: Tessellation part 1.
by Conor McCarthy (＠cmccarthy) 16 Apr '24

16 Apr '24

Doesn't support tessellation yet, but adds some requirements. -- v8: vkd3d-shader/ir: Validate tessellation declarations. vkd3d-shader/dxil: Implement DX intrinsic PrimitiveID. vkd3d-shader/dxil: Load hull shader properties. vkd3d-shader/dxil: Load domain shader properties. tests/hlsl: Add a tessellation test. https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/767

2 5

[PATCH 0/4] MR794: vkd3d-shader/hlsl: Improve SM1 support for non-float operations, part 6.
by Francisco Casas (＠fcasas) 16 Apr '24

16 Apr '24

This should be the last piece of the puzzle for SNK games. Basically, support for "if" conditionals for shader model 3.0 and 4.0. This is achieved through the use of the `if_comp` instruction (VKD3DSIH_IFC), but these are not handled by the cf_flattener. So I wrote `vsir_program_lower_ifc()` as a normalization pass to turn them into VKD3DSIH_IF in 3/4. This requires translating the condition of IFC into a separate vsir comparison instruction. I think I got the mapping right in `get_handler_idx_from_rel_op()` but it would be good if someone with more experience in SPIR-V takes a close look. -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/794

2 4