- wine-gitlab - winehq.org

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

02 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. -- v8: vkd3d-shader: Introduce a function to build a varying map between sm1 stages. vkd3d-shader/spirv: Make output varyings not consumed by the next stage private variables. vkd3d-shader: Implement remapping shader output registers to match the next shader's semantics. https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/280

3 6

[PATCH v3 0/1] MR3172: vkd3d: Import upstream release 1.8
by Alexandre Julliard (＠julliard) 02 Aug '23

02 Aug '23

-- v3: vkd3d: Import upstream release 1.8. https://gitlab.winehq.org/wine/wine/-/merge_requests/3172

5 6

[PATCH 0/33] MR294: vkd3d: Store command list commands in a buffer until executed.
by Conor McCarthy (＠cmccarthy) 02 Aug '23

02 Aug '23

It's no problem to send fewer of these per MR. I have included the complete set because all but the last introduce no functional changes, and upstreaming a smaller set would leave the changes in a half-done state with unnecessary buffering. -- This merge request has too many patches to be relayed via email. Please visit the URL below to see the contents of the merge request. https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/294

3 4

[PATCH 0/1] MR3486: wow64: Correct a reversed strcpy in wow64_NtQuerySystemInformation(SystemModuleInformation).
by Tim Clem (＠tclem) 02 Aug '23

02 Aug '23

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

2 1

[PATCH 0/3] MR3483: d2d1/tests: Add some more tests for effect shader loading.
by Nikolay Sivov (＠nsivov) 02 Aug '23

02 Aug '23

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3483

3 4

[PATCH v3 0/3] MR3472: secur32: Convert "Negotiate" to an LSA package.
by Dmitry Timoshkov (＠dmitry) 02 Aug '23

02 Aug '23

.Net assumes that Negotiate LSA package has index 0: https://github.com/dotnet/runtime/blob/f1d2be8f443a599a142506d622a35e1c2e68… -- v3: secur32/tests: Add some tests for "Negotiate" LSA package. secur32: Add a better stub for LsaApCallPackageUntrusted(NegGetCallerName). secur32: Convert "Negotiate" to an LSA package. https://gitlab.winehq.org/wine/wine/-/merge_requests/3472

3 4

[PATCH v5 0/9] MR281: vkd3d-shader/tpf: Replace sm4 register structs with vkd3d-shader register structs, part 1.
by Francisco Casas (＠fcasas) 02 Aug '23

02 Aug '23

Recap: I implemented relative addressing in !229, but I was suggested to handle register indexes by moving all the registers to the heap, which I did in my [nonconst-offsets-6](https://gitlab.winehq.org/fcasas/vkd3d/-/commits/noncon… branch. A part of this implementation required !269, but I was asked to try to turn the sm4 register structs into the vkd3d-shader register structs instead, to get closer to a common low level IR. This is the first part of that transformation. The whole thing is in my [use_vkd3d_reg](https://gitlab.winehq.org/fcasas/vkd3d/-/commits/use_vkd3d_r… branch. ~~This is built on top of !225 (the first two patches), so it may be good to get that upstream first.~~ --- This patch series aims to do the following replacements: ``` struct sm4_register -> struct vkd3d_shader_register struct sm4_dst_register -> struct vkd3d_shader_dst_param struct sm4_src_register -> struct vkd3d_shader_src_param ``` to get us closer to a common level IR and simplify the implementation of relative-addressing. To achieve this, the fields in the sm4 register structs are replaced with fields in the vkd3d-shader structs or removed altogether, one at the time. As can be seen when looking at the whole branch, it is possible to do this transformation without having to add additional fields to `struct vkd3d_shader_register`, by restricting each register type to a single `enum vkd3d_sm4_dimension` (and its src registers to a single `enum vkd3d_sm4_swizzle_type`) by default. The only exception we need so far is for sampler registers: They always have dimension NONE, except when used as arguments of gather instructions, in which case they have dimension VEC4 and SCALAR swizzle. This, and similar exceptions we may find in the future, can be handled using the opcode_info, as in 7/8 [81e17506](https://gitlab.winehq.org/fcasas/vkd3d/-/commit/81e17506ba2cb1fbf…. -- v5: vkd3d-shader/tpf: Get rid of sm4_register.dim. vkd3d-shader/tpf: Use 's' in src_info to expect sampler register with vec4 dimension. vkd3d-shader/tpf: Separate dst register write function. vkd3d-shader/tpf: Separate src register write function. vkd3d-shader/tpf: Make register_type_table an array of structs with lookup tables. vkd3d-shader/tpf: Introduce struct tpf_writer to group sm4 write arguments. vkd3d-shader/tpf: Use struct vkd3d_shader_register_index in sm4_register.idx[]. vkd3d-shader/tpf: Allow passing NULL register type on hlsl_sm4_register_from_semantic(). vkd3d-shader/tpf: Use enum vkd3d_shader_register_type in sm4_register.type. https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/281

3 11

[PATCH 0/1] MR3480: graphicscapture: Trim default debug channel.
by Mohamad Al-Jaf (＠maljaf) 02 Aug '23

02 Aug '23

The maximum size for a debug channel name is 15. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3480

3 2

[PATCH v3 0/14] MR3477: winedump: Improve regf files handling
by Piotr Caban (＠piotr) 02 Aug '23

02 Aug '23

-- v3: winedump: Support REG_QWORD values in regf files. winedump: Support dumping UTF16 value names in regf files. https://gitlab.winehq.org/wine/wine/-/merge_requests/3477

2 14

[PATCH v2 0/14] MR3477: winedump: Improve regf files handling
by Piotr Caban (＠piotr) 02 Aug '23

02 Aug '23

-- v2: winedump: Support REG_QWORD values in regf files. winedump: Support dumping UTF16 value names in regf files. winedump: Don't dump volatile keys from regf file. winedump: Enlarge buffer in dump_want_n helper. winedump: Skip data blocks when dumping regf files. winedump: Support REG_MULTI_SZ values in regf files. winedump: Support REG_BINARY values in regf files. winedump: Support REG_NONE values in regf files. winedump: Support REG_EXPAND_SZ values in regf files. winedump: Fix empty string handling in regf files. winedump: Support dumping default values without VAL_COMP_NAME flag. winedump: Support REG_DWORD values in regf files. winedump: Add support for decoding data stored in offset in regf files. winedump: Fix non null terminated strings printing in regf files. https://gitlab.winehq.org/wine/wine/-/merge_requests/3477

2 16

2025

2024

2023

2022

wine-gitlab