- wine-gitlab - winehq.org

[PATCH v5 0/5] MR280: vkd3d-shader: sm1 semantic matching.
by Zebediah Figura (＠zfigura) 01 Aug '23

01 Aug '23

This is probably the most ugly and controversial bit of API. I don't really know if this is the right approach to solving this. sm4 registers match by register index, such that shaders can mostly be compiled in isolation. sm1 does not—registers may be specified in any order in the vertex and pixel shaders, and will be matched by usage and usage index. By itself this is not much of a problem. Where it gets hairy is that we want to do some degree of caching, as well as pre-compilation, and avoid recompiling either shader every time it's matched with a new one. Wine currently deals with this problem, for GLSL, by generating a "main" GLSL shader for the vertex shader, and then an extra function setup_vs_output(), and linking the two together every time a new pixel shader is used. This could in theory be used for SPIR-V, but it requires the use of extra, probably external, code to link SPIR-V shaders together, which I do not particularly anticipate being well-received. (I'm not sure how Wine deals with this problem in the ARB backend. It seems to take the pixel shader signature into account when generating the vertex shader— cf. init_output_registers()—but it doesn't take it into account when looking up a vertex shader variant? I didn't look too closely at the code, so maybe I'm missing something.) -- The vkd3d parts of this patch are quite straightforward, and looking at them, I think the design is quite intuitive in isolation. There may be some room for internal refactoring (in particular with an eye to not so much overloading the "register_index" field of struct shader_signature_element) but I'm relatively happy with the way it turned out. In isolation, that is. The Wine part is worse. I've uploaded branches for vkd3d and Wine that use this API, and correctly handle shaders with some nontrivial reordering: https://gitlab.winehq.org/zfigura/vkd3d/-/commits/himavant5 https://gitlab.winehq.org/zfigura/wine/-/commits/himavant_cb The test can be run, as before, like so: make tests/shader_runner.exe && WINE_D3D_CONFIG=renderer=vulkan wine tests/shader_runner.exe ../vkd3d/tests/hlsl/sm1-interstage-interface.shader_test The interesting Wine parts are concentrated in a single patch, 5cfb9d930f11e. The patch takes a few shortcuts, partly because I wanted not to block the vkd3d API design questions, but also because while writing it I came up with a couple of problems that I wasn't sure how to fix. There are two main problems I see: (1) This patch has the user pass the signature from the pixel shader when compiling the vertex shader, and looks up register indices already arbitrarily allocated by the pixel shader. This is problematic when trying to use this signature as a cache key, by virtue of it not being clear (or even defined) which fields are key elements and which aren't. It's also not particularly kind to lookup, on account of not being directly comparable with memcmp(). There are a few options I see: (a) Provide an internal function to compare key elements. This feels... odd, like a very special-purpose function, but perhaps workable. (b) Just make the user deal with it, and assert that all fields are key elements. (c) Use some alternative, perhaps shortened structure as a field of vkd3d_shader_next_stage_info. This has the disadvantage that it is not as simple for a hypothetical user to retrieve from the pixel shader, but we would presumably provide a function to generate one from a shader signature. This would probably also be kinder to cache lookup if it's shorter. (d) Make caching vkd3d's responsibility, to some degree. This seems daunting, but the more we optimize, the more difficult it may be to design API that allows for nice caching. (2) Assuming we use signatures, there is a memory management problem that 5cfb9d930f11e spells out. This is probably a matter of "just fix it", but I suppose another option is to take the GLSL or ARB architecture. -- April is the cruellest month, breeding Lilacs out of the dead land, mixing Memory and desire, stirring Dull roots with spring rain. -- v5: vkd3d-shader: Introduce a function to build a varying map between sm1 stages. https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/280

2 6

[PATCH v2 0/2] MR3456: comctl32: Add support for MSAA events on tab controls.
by Esme Povirk (＠madewokherd) 01 Aug '23

01 Aug '23

-- v2: comctl32/tests: Test MSAA events for tab controls. comctl32: Add support for MSAA events on tab controls. https://gitlab.winehq.org/wine/wine/-/merge_requests/3456

4 5

[PATCH 0/1] MR3467: shell32/tests: Get rid of the a2bstr() helper.
by Michael Stefaniuc (＠mstefani) 31 Jul '23

31 Jul '23

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/3467

2 1

[PATCH v4 0/3] MR3351: mfmediaengine: Implement RemoveAllEffects().
by Bernhard Kölbl (＠besentv) 31 Jul '23

31 Jul '23

-- v4: mfmediaengine: Implement RemoveAllEffects(). mfmediaengine/tests: Add tests for RemoveAllEffects(). mfmediaengine/tests: Make ref checks more consistent. https://gitlab.winehq.org/wine/wine/-/merge_requests/3351

4 9

[PATCH v4 0/2] MR3461: gdiplus: Reject zero-width/zero-height rectangles
by David Kahurani (＠kahurani) 31 Jul '23

31 Jul '23

Works around the issue manifesting here : https://bugs.winehq.org/show_bug.cgi?id=55351 The MR also contains a patch that refactors the related tests a bit. Signed-off-by: David Kahurani k.kahurani(a)gmail.com -- v4: gdiplus: Move Flatten() tests into the same function gdiplus: Reject zero-width/zero-height rectangles https://gitlab.winehq.org/wine/wine/-/merge_requests/3461

3 3

[PATCH v7 0/5] MR219: vkd3d-shader: Implement tex2Dproj().
by Nikolay Sivov (＠nsivov) 31 Jul '23

31 Jul '23

-- v7: vkd3d-shader/hlsl: Implement texCUBEproj(). vkd3d-shader/d3dbc: Disallow 1D sampler types when writing sampler declaration. vkd3d-shader/hlsl: Implement tex3Dproj(). vkd3d-shader/hlsl: Implement tex1Dproj(). vkd3d-shader/hlsl: Implement tex2Dproj(). https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/219

2 5

[PATCH v4 0/1] MR3407: gdiplus: Disable StringFormatFlagsLineLimit
by David Kahurani (＠kahurani) 31 Jul '23

31 Jul '23

Builtin gdiplus behaves as documented but tests are indicating that Windows behaviour sometimes differs from the documentation. I believe this issue is at least one of the contributing issues to bug https://bugs.winehq.org/show_bug.cgi?id=46947, if not the sole issue. I propose that this flag be disabled until it is well understood. I noticed as issue with DrawString seeming to ignore the flag sometimes(sometimes the text fits without any noticeable defects which I believe is the case with the program in the bug) and sometimes even drawing clipped text with the flag on. Other times it works as expected. I can't seem to find a pattern to identify that could be used to predict its behaviour. Signed-off-by: David Kahurani k.kahurani(a)gmail.com -- v4: gdiplus: Fix StringFormatFlagsLineLimit handling https://gitlab.winehq.org/wine/wine/-/merge_requests/3407

4 9

[PATCH 0/6] MR291: vkd3d-shader/preproc: Various fixes.
by Zebediah Figura (＠zfigura) 31 Jul '23

31 Jul '23

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

3 7

[PATCH v2 0/4] MR288: hlsl: Some fixes caught by Wine tests.
by Zebediah Figura (＠zfigura) 31 Jul '23

31 Jul '23

-- v2: vkd3d-shader/tpf: Check buffer->status in add_section(). vkd3d-shader/d3dbc: Return ctx->result from hlsl_sm1_write(). vkd3d-shader/d3dbc: Free vkd3d_bytecode_buffer data on failure. https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/288

5 8

[PATCH v2 0/1] MR287: vkd3d: Implement ID3D12Fence1.
by Conor McCarthy (＠cmccarthy) 31 Jul '23

31 Jul '23

-- v2: vkd3d: Implement ID3D12Fence1. https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/287

3 2

2025

2024

2023

2022

wine-gitlab