Merge pull request #704 from kevgee/master

sebmerry · web-flow · commit e5ea2ac7430c · 2021-03-26T09:47:34.000-07:00
Changes to select the correct GPU (most powerful \ capable) in a multi-GPU configuration such as laptops
diff --git a/Samples/Desktop/D3D12MeshShaders/src/DynamicLOD/D3D12DynamicLOD.cpp b/Samples/Desktop/D3D12MeshShaders/src/DynamicLOD/D3D12DynamicLOD.cpp
@@ -128,7 +128,7 @@ void D3D12DynamicLOD::LoadPipeline()
     else
     {
         ComPtr<IDXGIAdapter1> hardwareAdapter;
-        GetHardwareAdapter(factory.Get(), &hardwareAdapter);
+        GetHardwareAdapter(factory.Get(), &hardwareAdapter, true);
 
         ThrowIfFailed(D3D12CreateDevice(
             hardwareAdapter.Get(),
diff --git a/Samples/Desktop/D3D12MeshShaders/src/MeshletCull/D3D12MeshletCull.cpp b/Samples/Desktop/D3D12MeshShaders/src/MeshletCull/D3D12MeshletCull.cpp
@@ -205,7 +205,7 @@ void D3D12MeshletCull::LoadPipeline()
     else
     {
         ComPtr<IDXGIAdapter1> hardwareAdapter;
-        GetHardwareAdapter(factory.Get(), &hardwareAdapter);
+        GetHardwareAdapter(factory.Get(), &hardwareAdapter, true);
 
         ThrowIfFailed(D3D12CreateDevice(
             hardwareAdapter.Get(),
diff --git a/Samples/Desktop/D3D12MeshShaders/src/MeshletInstancing/D3D12MeshletInstancing.cpp b/Samples/Desktop/D3D12MeshShaders/src/MeshletInstancing/D3D12MeshletInstancing.cpp
@@ -105,7 +105,7 @@ void D3D12MeshletInstancing::LoadPipeline()
     else
     {
         ComPtr<IDXGIAdapter1> hardwareAdapter;
-        GetHardwareAdapter(factory.Get(), &hardwareAdapter);
+        GetHardwareAdapter(factory.Get(), &hardwareAdapter, true);
 
         ThrowIfFailed(D3D12CreateDevice(
             hardwareAdapter.Get(),
diff --git a/Samples/Desktop/D3D12MeshShaders/src/MeshletRender/D3D12MeshletRender.cpp b/Samples/Desktop/D3D12MeshShaders/src/MeshletRender/D3D12MeshletRender.cpp
@@ -77,7 +77,7 @@ void D3D12MeshletRender::LoadPipeline()
     else
     {
         ComPtr<IDXGIAdapter1> hardwareAdapter;
-        GetHardwareAdapter(factory.Get(), &hardwareAdapter);
+        GetHardwareAdapter(factory.Get(), &hardwareAdapter, true);
 
         ThrowIfFailed(D3D12CreateDevice(
             hardwareAdapter.Get(),

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ void D3D12DynamicLOD::LoadPipeline()`
`128`	`128`	`else`
`129`	`129`	`{`
`130`	`130`	`ComPtr<IDXGIAdapter1> hardwareAdapter;`
`131`		`- GetHardwareAdapter(factory.Get(), &hardwareAdapter);`
	`131`	`+ GetHardwareAdapter(factory.Get(), &hardwareAdapter, true);`
`132`	`132`
`133`	`133`	`ThrowIfFailed(D3D12CreateDevice(`
`134`	`134`	`hardwareAdapter.Get(),`
Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ void D3D12MeshletCull::LoadPipeline()`
`205`	`205`	`else`
`206`	`206`	`{`
`207`	`207`	`ComPtr<IDXGIAdapter1> hardwareAdapter;`
`208`		`- GetHardwareAdapter(factory.Get(), &hardwareAdapter);`
	`208`	`+ GetHardwareAdapter(factory.Get(), &hardwareAdapter, true);`
`209`	`209`
`210`	`210`	`ThrowIfFailed(D3D12CreateDevice(`
`211`	`211`	`hardwareAdapter.Get(),`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ void D3D12MeshletInstancing::LoadPipeline()`
`105`	`105`	`else`
`106`	`106`	`{`
`107`	`107`	`ComPtr<IDXGIAdapter1> hardwareAdapter;`
`108`		`- GetHardwareAdapter(factory.Get(), &hardwareAdapter);`
	`108`	`+ GetHardwareAdapter(factory.Get(), &hardwareAdapter, true);`
`109`	`109`
`110`	`110`	`ThrowIfFailed(D3D12CreateDevice(`
`111`	`111`	`hardwareAdapter.Get(),`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ void D3D12MeshletRender::LoadPipeline()`
`77`	`77`	`else`
`78`	`78`	`{`
`79`	`79`	`ComPtr<IDXGIAdapter1> hardwareAdapter;`
`80`		`- GetHardwareAdapter(factory.Get(), &hardwareAdapter);`
	`80`	`+ GetHardwareAdapter(factory.Get(), &hardwareAdapter, true);`
`81`	`81`
`82`	`82`	`ThrowIfFailed(D3D12CreateDevice(`
`83`	`83`	`hardwareAdapter.Get(),`