Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement D3DKMTEnumAdapters2 and D3DKMTQueryAdapterInfo (for WDDM_2_7_CAPS) #259

Open
wants to merge 67 commits into
base: experimental_9.0
Choose a base branch
from
Open

Implement D3DKMTEnumAdapters2 and D3DKMTQueryAdapterInfo (for WDDM_2_7_CAPS) #259

wants to merge 67 commits into from

Conversation

liam-middlebrook
Copy link
Contributor

Implementations needed to support querying a D3DKMT adapter for WDDM_2_7_CAPS information. This work has partial overlap with commits which are already in upstream wine; individual commit messages contain reasoning for why they exist rather than cherry-picking patches from upstream.

Most notably, the third commit is the only commit which would need to be carried over in a rebase on-top of upstream Wine. It would need to be slightly re-written, some more notes in the commit message.

Hopefully the additional notes on change integration are helpful for you @ivyl

Paul Gofman and others added 30 commits October 2, 2024 17:26
@ivyl
ws2_32/Tests: Add tests for send buffering.
508a728 
(cherry picked from commit 8c02af2)

CW-Bug-Id: #24269
@ivyl
ntdll: Avoid short writes on nonblocking sockets.
832a61e 
(cherry picked from commit 535c8a8)

CW-Bug-Id: #24269
@ivyl
ntdll: Locally duplicated socket fd for background send.
ce15d36 
(cherry picked from commit d9a123b)

CW-Bug-Id: #24269
@ivyl
ntdll: Don't cancel background socket sends.
1eea231 
(cherry picked from commit 3d1c2b0)

CW-Bug-Id: #24269
@ivyl
server: Correct STATUS_NOT_FOUND return from (cancel_async).
ea84f2f 
(cherry picked from commit 4e43a78)

CW-Bug-Id: #24269
@ivyl
fixup! winevulkan: Share keyed mutex data.
ac4be53
@ivyl
winex11.drv: Set X window property to indicate if the presentation ma…
fad64fd 
…y flip.

CW-Bug-Id: #24273
@misterfifths @ivyl
nsiproxy: Only set the connection count from tcp_conns_enumerate_all …
b6eba4d 
…when appropriate.

Fixes heap corruption downstream in NsiEnumerateObjectsAllParametersEx.
Fixes a regression from 9085bc7.

(cherry picked from commit b81a189)
@misterfifths @ivyl
nsiproxy: Only set the endpoint count from udp_endpoint_enumerate_all…
3638eac 
… when appropriate.

Fixes heap corruption downstream in NsiEnumerateObjectsAllParametersEx.
Fixes a regression from a3f737f.

(cherry picked from commit f84f270)
@ivyl
kernel32/tests: Add a test for TLS links.
db96f88 
(cherry picked from commit ae2443a)

CW-Bug-Id: #24258
@ivyl
ntdll: Reserve space for some TLS directories at once.
fff0fab 
(cherry picked from commit 3b94e54)

CW-Bug-Id: #24258
@ivyl
ntdll: Iterate TEBs only once in alloc_tls_slot().
ab68793 
(cherry picked from commit 68fe975)

CW-Bug-Id: #24258
@ivyl
ntdll: Do not use TlsLinks for enumerating TEBs.
3d50128 
(cherry picked from commit de23dfc)

CW-Bug-Id: #24258
@ivyl
ntdll/tests: Add more tests for process instrumentation callback.
e7da5a1 
(cherry picked from commit e378962)

CW-Bug-Id: #24198
@ivyl
ntdll: Call instrumentation callback from wine_syscall_dispatcher on …
a91e43f 
…x64.

(cherry picked from commit 390d2d2)

CW-Bug-Id: #24198
@ivyl
ntdll: Call instrumentation callback for KiUserExceptionDispatcher on…
db90ca1 
… x64.

(cherry picked from commit 15bf582)

CW-Bug-Id: #24198
@ivyl
ntdll: Call instrumentation callback for LdrInitializeThunk on x64.
cabc00e 
(cherry picked from commit d06d058)

CW-Bug-Id: #24198
@ivyl
ntdll: Call instrumentation callback for KiUserModeCallback on x64.
dbd334b 
(cherry picked from commit 73de94b)

CW-Bug-Id: #24198
@ivyl
ntdll: Support old parameter layout for NtSetInformationProcess( Proc…
139fd55 
…essInstrumentationCallback ).

(cherry picked from commit 20c8c55)

CW-Bug-Id: #24198
@ivyl
fixup! ntdll: Support x86_64 syscall emulation.
95fab23 
CW-Bug-Id: #24198
@ivyl
Revert "ntdll: Change module search order in LdrFindEntryForAddress()."
2382761 
This reverts commit dc6bd58.

CW-Bug-Id: #24258
@ivyl
ntdll: Implement RtlRbInsertNodeEx().
6ea3cc3 
Based on Wine RB tree implementation in include/wine/rbtree.h.

(cherry picked from commit 9a9bc22)

CW-Bug-Id: #24258
@ivyl
ntdll: Implement RtlRbRemoveNode().
17b61f5 
Based on Wine RB tree implementation in include/wine/rbtree.h.

(cherry picked from commit 067b6a8)

CW-Bug-Id: #24258
@ivyl
ntdll/tests: Add tests for RTL RB tree.
2b697f0 
(cherry picked from commit 6772091)

CW-Bug-Id: #24258
@ivyl
ntdll: Fill LDR_DATA_TABLE_ENTRY.BaseAddressIndexNode.
efadc74 
(cherry picked from commit 4f3c7ef)

CW-Bug-Id: #24258
@ivyl
ntdll: Use base address tree in get_modref().
713554e 
(cherry picked from commit f7867d5)

CW-Bug-Id: #24258
@ivyl
ntdll: Use base address tree in LdrFindEntryForAddress().
5df0fa5 
(cherry picked from commit 30cf3c4)

CW-Bug-Id: #24258
@ivyl
ntdll: Implement NtSetInformationProcess( ProcessTlsInformation ).
a3c850f 
CW-Bug-Id: #24258
@ivyl
ntdll: Use NtSetInformationProcess( ProcessTlsInformation ) in alloc_…
1bd85e4 
…tls_slot().

CW-Bug-Id: #24258
@ivyl
ntdll: Match memory allocation layout for ThreadLocalStoragePointer.
7ebedd3 
CW-Bug-Id: #24258
Paul Gofman and others added 11 commits October 2, 2024 17:26
@ivyl
ntdll: HACK: Enable WINE_ALERT_SIMULATE_SCHED_QUANTUM option for Mary…
9db402d 
… Skelter 2.

CW-Bug-Id: #24283
@ivyl
Revert "win32u: Correctly fill new foreground window TID in WM_ACTIVA…
38e2231 
…TEAPP."

This reverts commit f06ad04.

CW-Bug-Id: #24294
@ivyl
win32u: Call set_active_window() helper directly from handle_internal…
cd414fc 
…_message().

(cherry picked from commit 99bfda5)

CW-Bug-Id: #24294
@ivyl
win32u: Correctly fill new foreground window TID in WM_ACTIVATEAPP.
e05e0ba 
(cherry picked from commit b84fbae)

CW-Bug-Id: #24294
@ivyl
fixup! ntdll: Skip dll file search when getting module handle.
849d4bd 
CW-Bug-Id: #24315
@ivyl
ntdll: HACK: Force en-US locale for EAC launcher.
d6e4afd 
CW-Bug-Id: #24326
@ivyl
user32/tests: Add tests for QueryDisplayConfig( QDC_VIRTUAL_MODE_AWAR…
68460d3 
…E ).

CW-Bug-Id: #24333
@ivyl
win32u: Support QDC_VIRTUAL_MODE_AWARE in NtUserGetDisplayConfigBuffe…
1a1f136 
…rSizes().

CW-Bug-Id: #24333
@ivyl
win32u: Support QDC_VIRTUAL_MODE_AWARE in NtUserQueryDisplayConfig().
5416bf6 
CW-Bug-Id: #24333
@liam-middlebrook
gdi32: Implement D3DKMTEnumAdapters2
f25c0d0 
Signed-off-by: Liam Middlebrook <lmiddlebrook@nvidia.com>

Note: This commit is specifically targeted towards ValveSoftware/wine experimental_9.0 branch.
Upstream wine contains commits which already implement this, but are part of a larger series of
changes inter-twined with WoW64 and unification of GDI backends.
@liam-middlebrook
win32u: Move D3DKMTQueryAdapterInfo into gdi_dc_funcs
23d772f 
Signed-off-by: Liam Middlebrook <lmiddlebrook@nvidia.com>

Note: This commit is specifically targeted towards ValveSoftware/wine experimental_9.0 branch.
Upstream wine contains commits which already implement this, but are part of a larger series of
changes inter-twined with WoW64 and unification of GDI backends.
@Blisto91 Blisto91 mentioned this pull request Oct 17, 2024
Closed
@ryzendew
Copy link

ryzendew commented Oct 17, 2024 •
edited
Loading

Not sure where to Report this but doing it here Black myth wukong starts with dlss FG enabled but than if you turn it off it refuses to turn back on and says this
image

Fast edit thanks for not deleting my report unlike on that other repo ...

@shelterx
Copy link

Not sure where to Report this but doing it here Black myth wukong starts with dlss FG enabled but than if you turn it off it refuses to turn back on and says this !

For me it started with FG off and I can't turn it on, so it's basically the same thing I mentioned here. But once DLSS-FG landed I think it's better to put an issue for each game, the HAGS issue must be resolved tho' since more games might depend on it.

@shelterx
Copy link

Hmm having HAGS exposed seem to cause stutter in Cyberpunk 2077 even if FG isn't enabled.

@liam-middlebrook
winex11.drv: Implement D3DKMTQueryAdapterInfo WDDM_2_7_CAPS
b239fbc 
Used by applications to query support for "Hardware Scheduling" for GPU
workloads. This is used as a proxy to determine scheduling guarantees
between userspace command submission and GPU execution.

Signed-off-by: Liam Middlebrook <lmiddlebrook@nvidia.com>

Note: This commit is specifically targeted towards ValveSoftware/wine experimental_9.0 branch.
Upstream wine contains commits which change how this would be implemented. Notably, the changes in
`dlls/winex11.drv/x11drv_main.c` should be instead made in `dlls/win32u/d3dkmt.c`.
Plagman pushed a commit that referenced this pull request Nov 6, 2024
@liam-middlebrook @ivyl
gdi32: Implement D3DKMTEnumAdapters2
5207004 
Signed-off-by: Liam Middlebrook <lmiddlebrook@nvidia.com>

Note: This commit is specifically targeted towards ValveSoftware/wine experimental_9.0 branch.
Upstream wine contains commits which already implement this, but are part of a larger series of
changes inter-twined with WoW64 and unification of GDI backends.

Link: #259
Plagman pushed a commit that referenced this pull request Nov 6, 2024
@liam-middlebrook @ivyl
win32u: Move D3DKMTQueryAdapterInfo into gdi_dc_funcs
9637473 
Signed-off-by: Liam Middlebrook <lmiddlebrook@nvidia.com>

Note: This commit is specifically targeted towards ValveSoftware/wine experimental_9.0 branch.
Upstream wine contains commits which already implement this, but are part of a larger series of
changes inter-twined with WoW64 and unification of GDI backends.

Link: #259
Plagman pushed a commit that referenced this pull request Nov 6, 2024
@liam-middlebrook @ivyl
winex11.drv: Implement D3DKMTQueryAdapterInfo WDDM_2_7_CAPS
22a8cff 
Used by applications to query support for "Hardware Scheduling" for GPU
workloads. This is used as a proxy to determine scheduling guarantees
between userspace command submission and GPU execution.

Signed-off-by: Liam Middlebrook <lmiddlebrook@nvidia.com>

Note: This commit is specifically targeted towards ValveSoftware/wine experimental_9.0 branch.
Upstream wine contains commits which change how this would be implemented. Notably, the changes in
`dlls/winex11.drv/x11drv_main.c` should be instead made in `dlls/win32u/d3dkmt.c`.

Link: #259
@philipl
Copy link

philipl commented Nov 13, 2024

I don't know how useful it is to mention here, but I tried the new Proton Experimental release and while FG works well in Cyberpunk, I cannot turn it on in Everspace 2 because the game reports that HAGS is not enabled. As I understand it, this PR is present in this Proton release so it ought to work.

bylaws pushed a commit to bylaws/wine that referenced this pull request Nov 15, 2024
@liam-middlebrook @bylaws
gdi32: Implement D3DKMTEnumAdapters2
747ead8 
Signed-off-by: Liam Middlebrook <lmiddlebrook@nvidia.com>

Note: This commit is specifically targeted towards ValveSoftware/wine experimental_9.0 branch.
Upstream wine contains commits which already implement this, but are part of a larger series of
changes inter-twined with WoW64 and unification of GDI backends.

Link: ValveSoftware/wine#259
bylaws pushed a commit to bylaws/wine that referenced this pull request Nov 15, 2024
@liam-middlebrook @bylaws
win32u: Move D3DKMTQueryAdapterInfo into gdi_dc_funcs
8d042bc 
Signed-off-by: Liam Middlebrook <lmiddlebrook@nvidia.com>

Note: This commit is specifically targeted towards ValveSoftware/wine experimental_9.0 branch.
Upstream wine contains commits which already implement this, but are part of a larger series of
changes inter-twined with WoW64 and unification of GDI backends.

Link: ValveSoftware/wine#259
bylaws pushed a commit to bylaws/wine that referenced this pull request Nov 15, 2024
@liam-middlebrook @bylaws
winex11.drv: Implement D3DKMTQueryAdapterInfo WDDM_2_7_CAPS
4f196b7 
Used by applications to query support for "Hardware Scheduling" for GPU
workloads. This is used as a proxy to determine scheduling guarantees
between userspace command submission and GPU execution.

Signed-off-by: Liam Middlebrook <lmiddlebrook@nvidia.com>

Note: This commit is specifically targeted towards ValveSoftware/wine experimental_9.0 branch.
Upstream wine contains commits which change how this would be implemented. Notably, the changes in
`dlls/winex11.drv/x11drv_main.c` should be instead made in `dlls/win32u/d3dkmt.c`.

Link: ValveSoftware/wine#259
Plagman pushed a commit that referenced this pull request Nov 27, 2024
@liam-middlebrook @ivyl
gdi32: Implement D3DKMTEnumAdapters2
a470704 
Signed-off-by: Liam Middlebrook <lmiddlebrook@nvidia.com>

Note: This commit is specifically targeted towards ValveSoftware/wine experimental_9.0 branch.
Upstream wine contains commits which already implement this, but are part of a larger series of
changes inter-twined with WoW64 and unification of GDI backends.

Link: #259
Plagman pushed a commit that referenced this pull request Nov 27, 2024
@liam-middlebrook @ivyl
win32u: Move D3DKMTQueryAdapterInfo into gdi_dc_funcs
979fb68 
Signed-off-by: Liam Middlebrook <lmiddlebrook@nvidia.com>

Note: This commit is specifically targeted towards ValveSoftware/wine experimental_9.0 branch.
Upstream wine contains commits which already implement this, but are part of a larger series of
changes inter-twined with WoW64 and unification of GDI backends.

Link: #259
Plagman pushed a commit that referenced this pull request Nov 27, 2024
@liam-middlebrook @ivyl
winex11.drv: Implement D3DKMTQueryAdapterInfo WDDM_2_7_CAPS
15c0fcd 
Used by applications to query support for "Hardware Scheduling" for GPU
workloads. This is used as a proxy to determine scheduling guarantees
between userspace command submission and GPU execution.

Signed-off-by: Liam Middlebrook <lmiddlebrook@nvidia.com>

Note: This commit is specifically targeted towards ValveSoftware/wine experimental_9.0 branch.
Upstream wine contains commits which change how this would be implemented. Notably, the changes in
`dlls/winex11.drv/x11drv_main.c` should be instead made in `dlls/win32u/d3dkmt.c`.

Link: #259
@philipl
Copy link

philipl commented Dec 3, 2024

I don't know how useful it is to mention here, but I tried the new Proton Experimental release and while FG works well in Cyberpunk, I cannot turn it on in Everspace 2 because the game reports that HAGS is not enabled. As I understand it, this PR is present in this Proton release so it ought to work.

For the record, this seems to be specific to multi-GPU scenarios. I have the Intel iGPU active in the system, and it seems like HAGS detection failed when I was hiding the Intel GPU from Vulkan (due to the game crashing when it was visible). The developers gave me a work around to avoid hiding it and then detection worked. I assume, in some very hand wavy way that hiding the iGPU from the game while the system is able to see it leads to some kind of mismatch in device identification when querying the device properties in this change, but I'm not in a position to say precisely what's going on.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@liam-middlebrook @ryzendew @shelterx @philipl @misterfifths @julliard @nsivov @DadSchoorse @ivyl