Merge pull request #704 from kevgee/master

Changes to select the correct GPU (most powerful \ capable) in a multi-GPU configuration such as laptops
microsoft · Mar 26, 2021 · e5ea2ac · e5ea2ac
2 parents 58b6bb1 + 1e6a089
commit e5ea2ac
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
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(),