fix: automatic selection for hybrid GPU and IDDSampleDriver users #3002

Nonary · 2024-08-10T19:02:05Z

Description

Enhances the ddprobe utility to test to see if frames can be captured and that they are also not empty frames. If one of the 10 frames captured is not empty, it will return back successful. Previously it was only testing to see if it can be duplicated, but would fail on capturing frames which would cause Sunshine to pick the wrong GPU.

Screenshot

N/A

Issues Fixed or Closed

Fixes Failed to locate an output device, DuplicateOutput() test failed [0x887A0004], No displays were found after reenumeration! #2203
Fixes Unable to connect to IddSampleDriver display #2076
Fixes Black screen with multiple GPUs with virtual display, isolated to simply multiple GPUs #2875
Fixes Sunshine doesn't switch display adapter between laptop iGPU and dGPU #2078
Fixes [Nightly] Sunshine chose wrong adaptor. #1632

Type of Change

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to not work as expected)
Dependency update (updates to dependencies)
Documentation update (changes to documentation)
Repository update (changes to repository files, e.g. .github/...)

Checklist

My code follows the style guidelines of this project
I have performed a self-review of my own code
I have commented my code, particularly in hard-to-understand areas
I have added or updated the in code docstring/documentation-blocks for new or existing methods/components

codecov · 2024-08-10T19:45:34Z

Codecov Report

Attention: Patch coverage is 46.15385% with 7 lines in your changes missing coverage. Please review.

Project coverage is 9.87%. Comparing base (5bc32cd) to head (ec488ca).
Report is 1 commits behind head on master.

Files with missing lines	Patch %	Lines
src/platform/windows/display_base.cpp	46.15%	2 Missing and 5 partials ⚠️

Additional details and impacted files

@@            Coverage Diff            @@
##           master   #3002      +/-   ##
=========================================
- Coverage    9.88%   9.87%   -0.01%     
=========================================
  Files         101     101              
  Lines       17975   17980       +5     
  Branches     8402    8408       +6     
=========================================
- Hits         1776    1775       -1     
+ Misses      13321   13318       -3     
- Partials     2878    2887       +9

Flag	Coverage Δ
Linux	`7.27% <ø> (-0.07%)`	⬇️
Windows	`5.10% <46.15%> (+0.02%)`	⬆️
macOS-12	`10.79% <ø> (-0.02%)`	⬇️
macOS-13	`10.74% <ø> (+0.02%)`	⬆️
macOS-14	`10.03% <ø> (+0.01%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines	Coverage Δ
src/platform/windows/display_base.cpp	`13.60% <46.15%> (+0.67%)`	⬆️

... and 7 files with indirect coverage changes

tools/ddprobe.cpp

FrogTheFrog · 2024-08-11T08:54:17Z

I have no idea about whether the code logic is correct or not, but I've added a few remarks about other stuff.

tools/ddprobe.cpp

cgutman · 2024-08-16T03:19:16Z

tools/ddprobe.cpp

+
+  // If duplication is successful, test frame capture
+  HRESULT captureResult = test_frame_capture(dup, device_ptr.Get());
+  if (FAILED(captureResult)) {


S_FALSE is a success value, so I'm not sure how this could be working. I think we would just return S_OK in the case like we did before?

Nice catch! Did not see that at all, fixed it

cgutman · 2024-08-16T03:23:17Z

tools/ddprobe.cpp

+  }
+
+  // If duplication is successful, test frame capture
+  HRESULT captureResult = test_frame_capture(dup, device_ptr.Get());


I'm concerned we may generate false negatives for previously working systems. Can we pass a parameter into ddprobe to allow us to do a first pass with your new check followed by a second pass without if the first one finds no matching configurations?

Updated the code to make the frame capture point optional like you suggested

tools/ddprobe.cpp

ReenigneArcher · 2024-09-14T17:03:23Z

Also, we now use semantic PRs. Could you make the PR title follow the conventional commit guidelines? https://www.conventionalcommits.org/en/v1.0.0/

…ual displays - Added `test_frame_capture` function to verify if frames are successfully captured and not empty. - Fixes issues with virtual displays such as IDDSampleDriver when using more than one GPU.

It occoured to me there might be some desktop images that are predominately black, which could cause a false positive.

Co-authored-by: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com>

Co-authored-by: Cameron Gutman <aicommander@gmail.com>

sonarcloud · 2024-09-29T20:04:37Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

…zardByte#3002) * Fix frame capture and output duplication for dual GPU setups and virtual displays - Added `test_frame_capture` function to verify if frames are successfully captured and not empty. - Fixes issues with virtual displays such as IDDSampleDriver when using more than one GPU. Co-authored-by: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Co-authored-by: Cameron Gutman <aicommander@gmail.com>

Nonary mentioned this pull request Aug 10, 2024

How to select specifial GPU for one screen? itsmikethetech/Virtual-Display-Driver#110

Open

FrogTheFrog reviewed Aug 11, 2024

View reviewed changes

tools/ddprobe.cpp Outdated Show resolved Hide resolved

FrogTheFrog reviewed Aug 11, 2024

View reviewed changes

tools/ddprobe.cpp Outdated Show resolved Hide resolved

FrogTheFrog reviewed Aug 11, 2024

View reviewed changes

tools/ddprobe.cpp Outdated Show resolved Hide resolved

FrogTheFrog reviewed Aug 11, 2024

View reviewed changes

tools/ddprobe.cpp Outdated Show resolved Hide resolved

FrogTheFrog reviewed Aug 11, 2024

View reviewed changes

tools/ddprobe.cpp Outdated Show resolved Hide resolved

This comment was marked as resolved.

Sign in to view

Nonary force-pushed the gpu_selection_fix_v2 branch from 09b988d to eac1166 Compare August 12, 2024 04:06

FrogTheFrog reviewed Aug 12, 2024

View reviewed changes

tools/ddprobe.cpp Outdated Show resolved Hide resolved

FrogTheFrog reviewed Aug 12, 2024

View reviewed changes

tools/ddprobe.cpp Outdated Show resolved Hide resolved

Nonary mentioned this pull request Aug 13, 2024

Cannot connect a second time unless restart the system #2670

Open

3 tasks

This comment was marked as resolved.

Sign in to view

ReenigneArcher mentioned this pull request Aug 13, 2024

headers-git: error with winrt headers due to absence of fully qualified data types msys2/MINGW-packages#21645

Closed

7 tasks

This comment was marked as resolved.

Sign in to view

cgutman requested changes Aug 16, 2024

View reviewed changes

Nonary mentioned this pull request Aug 18, 2024

The script doesnt work half the time Nonary/MonitorSwapAutomation#46

Closed

ReenigneArcher reviewed Aug 23, 2024

View reviewed changes

tools/ddprobe.cpp Outdated Show resolved Hide resolved

tools/ddprobe.cpp Show resolved Hide resolved

tools/ddprobe.cpp Outdated Show resolved Hide resolved

ReenigneArcher reviewed Aug 23, 2024

View reviewed changes

tools/ddprobe.cpp Outdated Show resolved Hide resolved

ReenigneArcher requested a review from cgutman August 27, 2024 15:38

Nonary mentioned this pull request Aug 27, 2024

Moonlight throwing error: "No video received from Host" when using Virtual Display itsmikethetech/Virtual-Display-Driver#9

Open

Nonary changed the title ~~Fix multi GPU automatic selection for hybrid GPU and IDDSampleDriver~~ fix: automatic selection for hybrid GPU and IDDSampleDriver users Sep 14, 2024

ReenigneArcher force-pushed the gpu_selection_fix_v2 branch from f620a95 to 4bdae9c Compare September 14, 2024 22:19

cgutman approved these changes Sep 29, 2024

View reviewed changes

Nonary and others added 18 commits September 29, 2024 14:56

Fix frame capture and output duplication for dual GPU setups and virt…

2c71645

…ual displays - Added `test_frame_capture` function to verify if frames are successfully captured and not empty. - Fixes issues with virtual displays such as IDDSampleDriver when using more than one GPU.

Check all pixels instead

53fc9b2

It occoured to me there might be some desktop images that are predominately black, which could cause a false positive.

clang fixes

4cac356

code review suggestions

da99ff5

attempt to match previous coding styles

9ad6180

remove else statements

2d26cf6

remove code changes that were not needed

0797460

move unmap to fail guard

ad6aab7

implement cgutmans ideas

d263611

clang fixes

a17605f

fix documentation

5696d1b

Update tools/ddprobe.cpp

8a17a5b

Co-authored-by: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com>

more doc fixes

d674ef9

Update tools/ddprobe.cpp

a86f25f

Co-authored-by: Cameron Gutman <aicommander@gmail.com>

implement suggestions from cgutman

a9c0a95

add an additional space

6a8e941

fix compliler errors

141ab4c

make sonarcloud happy again

ec488ca

cgutman force-pushed the gpu_selection_fix_v2 branch from 4bdae9c to ec488ca Compare September 29, 2024 19:56

cgutman enabled auto-merge (squash) September 29, 2024 19:56

cgutman merged commit fceda35 into LizardByte:master Sep 29, 2024
38 checks passed

cathyjf mentioned this pull request Oct 8, 2024

Increase first frame timeout moonlight-stream/moonlight-common-c#93

Open

cgutman mentioned this pull request Oct 12, 2024

fix(display): fix logic to remember ddprobe already ran #3293

Merged

10 tasks

Nonary mentioned this pull request Oct 15, 2024

IddSampleDriver no longer works properly on latest version #948

Closed

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: automatic selection for hybrid GPU and IDDSampleDriver users #3002

fix: automatic selection for hybrid GPU and IDDSampleDriver users #3002

Nonary commented Aug 10, 2024 •

edited by ReenigneArcher

Loading

codecov bot commented Aug 10, 2024 •

edited

Loading

FrogTheFrog commented Aug 11, 2024

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

cgutman Aug 16, 2024

Nonary Aug 17, 2024

cgutman Aug 16, 2024

Nonary Aug 17, 2024

ReenigneArcher commented Sep 14, 2024

sonarcloud bot commented Sep 29, 2024

fix: automatic selection for hybrid GPU and IDDSampleDriver users #3002

fix: automatic selection for hybrid GPU and IDDSampleDriver users #3002

Conversation

Nonary commented Aug 10, 2024 • edited by ReenigneArcher Loading

Description

Screenshot

Issues Fixed or Closed

Type of Change

Checklist

codecov bot commented Aug 10, 2024 • edited Loading

Codecov Report

FrogTheFrog commented Aug 11, 2024

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

cgutman Aug 16, 2024

Choose a reason for hiding this comment

Nonary Aug 17, 2024

Choose a reason for hiding this comment

cgutman Aug 16, 2024

Choose a reason for hiding this comment

Nonary Aug 17, 2024

Choose a reason for hiding this comment

ReenigneArcher commented Sep 14, 2024

sonarcloud bot commented Sep 29, 2024

Quality Gate passed

Nonary commented Aug 10, 2024 •

edited by ReenigneArcher

Loading

codecov bot commented Aug 10, 2024 •

edited

Loading