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

[PATCH v8 0/5] MR749: vkd3d-shader/ir: Minimise temp usage.
by Conor McCarthy (＠cmccarthy) April 8, 2024

April 8, 2024

Overall this is simpler, results in less verbose SPIR-V code which is easier to debug, and eliminates stuttering issues in Horizon Zero Dawn when run in an SM 6 dev branch with Gio's cfg4 structuriser branch. -- v8: vkd3d-shader/ir: Materialise SSAs to temps before lowering switch instructions. vkd3d-shader/ir: Convert SSAs to temps only if the block of origin does not dominate all uses. vkd3d-shader/spirv: Handle uint2 to double bitcast in spirv_compiler_emit_mov(). vkd3d-shader/spirv: Emit a uint result for RESINFO_UINT if the dst register is SSA. vkd3d-shader/ir: Materialise phis to temps in the incoming blocks. https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/749

4 10

Re: [PATCH v5 0/9] MR744: vkd3d-shader/hlsl: Improve SM1 support for non-float operations, part 5. - approved
by Henri Verbeet (＠hverbeet) April 8, 2024

April 8, 2024

This merge request was approved by Henri Verbeet. -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/744

1 0

[PATCH v2 0/3] MR765: tests: Do not crash on llvmpipe.
by Giovanni Mascellani (＠giomasce) April 8, 2024

April 8, 2024

-- v2: tests: Pop the test context when leaving its scope. tests: Skip tests that crash on llvmpipe. https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/765

3 4

Re: [PATCH v3 0/1] MR761: tests/shader_runner: Report compilation errors on the block's starting line.
by Henri Verbeet (＠hverbeet) April 8, 2024

April 8, 2024

This seems a little fragile. Could we just track the starting line for things touching "shader_source" and then setup/restore the test context in e.g. compile_shader()? -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/761#note_67241

1 0

Re: [PATCH v11 0/3] MR734: vkd3d-shader/dxil: SamplePosition and SampleCount.
by Henri Verbeet (＠hverbeet) April 8, 2024

April 8, 2024

> ```diff > +#define create_default_texture2dms(a, b, c, d, e, f, g, h) create_default_texture2dms_(__LINE__, a, b, c, d, e, f, g, h) > +static inline ID3D12Resource *create_default_texture2dms_(unsigned int line, ID3D12Device *device, > + unsigned int width, unsigned int height, unsigned int array_size, unsigned int sample_count, > + DXGI_FORMAT format, D3D12_RESOURCE_FLAGS flags, D3D12_RESOURCE_STATES initial_state) > +{ > + return create_default_texture_(line, device, D3D12_RESOURCE_DIMENSION_TEXTURE2D, width, height, array_size, 1, > + format, sample_count, flags | D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET, initial_state); > } > ``` It doesn't seem ideal to swap the order of "format" and "sample_count" between create_default_texture_() and create_default_texture2dms_(). Also, why are we adding D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET here? > ```diff > +[srv 0] > +% r32g32b32a32 is not necessarily supported with 4x MSAA. > +format r32 float > +size (2dms, 4, 2, 2) > +% Data upload is not supported. > ``` Sure, but I don't think data upload is needed here either. > ```diff > +% 4.1 supports GetRenderTargetSamplePosition/Count but not UAVs, and returning > +% results in the RTV brings complications in D3D11. > ``` Which complications would those be? > ```diff > - resource->resource = create_default_texture2d(device, params->width, params->height, 1, params->level_count, > - params->format, D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET, D3D12_RESOURCE_STATE_RENDER_TARGET); > + if (params->sample_count) > + { > + if (params->level_count > 1) > + fatal_error("Multisample resource has multiple levels.\n"); > + resource->resource = create_default_texture2dms(device, params->width, params->height, 1, params->sample_count, > + params->format, D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET, D3D12_RESOURCE_STATE_RENDER_TARGET); > + } > + else > + { > + resource->resource = create_default_texture2d(device, params->width, params->height, 1, params->level_count, > + params->format, D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET, D3D12_RESOURCE_STATE_RENDER_TARGET); > + } > ``` It seems tempting to just use create_default_texture_(). -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/734#note_67240

1 0

[PATCH v3 0/5] MR767: vkd3d-shader/dxil: Tessellation part 1.
by Conor McCarthy (＠cmccarthy) April 8, 2024

April 8, 2024

Doesn't support tessellation yet, but adds some requirements. -- v3: 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. https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/767

2 5

Re: [PATCH v4 0/2] MR740: Implement hyperbolic trigonometry operations. - approved
by Giovanni Mascellani (＠giomasce) April 8, 2024

April 8, 2024

This merge request was approved by Giovanni Mascellani. -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/740

1 0

[PATCH v2 0/1] MR5464: mf/tests: Check that D3D aware attribute has no effect on the topology.
by Rémi Bernon April 8, 2024

April 8, 2024

Wine incorrectly inserts a sample copier. D3D awareness is handled per node, and each node will have their own sample allocator created from the D3D device manager provided by the session. -- v2: mf/tests: Check that D3D aware attribute has no effect on the topology. https://gitlab.winehq.org/wine/wine/-/merge_requests/5464

2 2

[PATCH v2 0/10] MR768: Draft: vkd3d-shader/dxil: Tessellation part 2.
by Conor McCarthy (＠cmccarthy) April 8, 2024

April 8, 2024

Goes atop !767. The last five commits belong here. -- v2: 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 v2 0/5] MR767: vkd3d-shader/dxil: Tessellation part 1.
by Conor McCarthy (＠cmccarthy) April 8, 2024

April 8, 2024

Doesn't support tessellation yet, but adds some requirements. -- v2: 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

3 6