Merge pull request #24 from Microsoft/develop

Explicitly disable fullscreen transitions in API samples that don't support it. Issue #21
microsoft · Sep 11, 2015 · 8f64a67 · 8f64a67
2 parents cf5952d + 1dfa736
commit 8f64a67
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 0 deletions.
diff --git a/Samples/D3D1211On12/src/D3D1211On12.cpp b/Samples/D3D1211On12/src/D3D1211On12.cpp
@@ -111,6 +111,9 @@ void D3D1211on12::LoadPipeline()
 
 	ThrowIfFailed(swapChain.As(&m_swapChain));
 
+	// This sample does not support fullscreen transitions.
+	ThrowIfFailed(factory->MakeWindowAssociation(m_hwnd, DXGI_MWA_NO_ALT_ENTER));
+
 	m_frameIndex = m_swapChain->GetCurrentBackBufferIndex();
 
 	// Create an 11 device wrapped around the 12 device and share

diff --git a/Samples/D3D12Bundles/src/D3D12Bundles.cpp b/Samples/D3D12Bundles/src/D3D12Bundles.cpp
@@ -108,6 +108,9 @@ void D3D12Bundles::LoadPipeline()
 
 	ThrowIfFailed(swapChain.As(&m_swapChain));
 
+	// This sample does not support fullscreen transitions.
+	ThrowIfFailed(factory->MakeWindowAssociation(m_hwnd, DXGI_MWA_NO_ALT_ENTER));
+
 	m_frameIndex = m_swapChain->GetCurrentBackBufferIndex();
 
 	// Create descriptor heaps.

diff --git a/Samples/D3D12DynamicIndexing/src/D3D12DynamicIndexing.cpp b/Samples/D3D12DynamicIndexing/src/D3D12DynamicIndexing.cpp
@@ -112,6 +112,9 @@ void D3D12DynamicIndexing::LoadPipeline()
 
 	ThrowIfFailed(swapChain.As(&m_swapChain));
 
+	// This sample does not support fullscreen transitions.
+	ThrowIfFailed(factory->MakeWindowAssociation(m_hwnd, DXGI_MWA_NO_ALT_ENTER));
+
 	m_frameIndex = m_swapChain->GetCurrentBackBufferIndex();
 
 	// Create descriptor heaps.

diff --git a/Samples/D3D12ExecuteIndirect/src/D3D12ExecuteIndirect.cpp b/Samples/D3D12ExecuteIndirect/src/D3D12ExecuteIndirect.cpp
@@ -129,6 +129,9 @@ void D3D12ExecuteIndirect::LoadPipeline()
 
 	ThrowIfFailed(swapChain.As(&m_swapChain));
 
+	// This sample does not support fullscreen transitions.
+	ThrowIfFailed(factory->MakeWindowAssociation(m_hwnd, DXGI_MWA_NO_ALT_ENTER));
+
 	m_frameIndex = m_swapChain->GetCurrentBackBufferIndex();
 
 	// Create descriptor heaps.

diff --git a/Samples/D3D12HelloWorld/src/HelloBundles/D3D12HelloBundles.cpp b/Samples/D3D12HelloWorld/src/HelloBundles/D3D12HelloBundles.cpp
@@ -101,6 +101,9 @@ void D3D12HelloBundles::LoadPipeline()
 
 	ThrowIfFailed(swapChain.As(&m_swapChain));
 
+	// This sample does not support fullscreen transitions.
+	ThrowIfFailed(factory->MakeWindowAssociation(m_hwnd, DXGI_MWA_NO_ALT_ENTER));
+
 	m_frameIndex = m_swapChain->GetCurrentBackBufferIndex();
 
 	// Create descriptor heaps.

diff --git a/Samples/D3D12HelloWorld/src/HelloConstBuffers/D3D12HelloConstBuffers.cpp b/Samples/D3D12HelloWorld/src/HelloConstBuffers/D3D12HelloConstBuffers.cpp
@@ -102,6 +102,9 @@ void D3D12HelloConstBuffers::LoadPipeline()
 
 	ThrowIfFailed(swapChain.As(&m_swapChain));
 
+	// This sample does not support fullscreen transitions.
+	ThrowIfFailed(factory->MakeWindowAssociation(m_hwnd, DXGI_MWA_NO_ALT_ENTER));
+
 	m_frameIndex = m_swapChain->GetCurrentBackBufferIndex();
 
 	// Create descriptor heaps.

diff --git a/Samples/D3D12HelloWorld/src/HelloTexture/D3D12HelloTexture.cpp b/Samples/D3D12HelloWorld/src/HelloTexture/D3D12HelloTexture.cpp
@@ -101,6 +101,9 @@ void D3D12HelloTexture::LoadPipeline()
 
 	ThrowIfFailed(swapChain.As(&m_swapChain));
 
+	// This sample does not support fullscreen transitions.
+	ThrowIfFailed(factory->MakeWindowAssociation(m_hwnd, DXGI_MWA_NO_ALT_ENTER));
+
 	m_frameIndex = m_swapChain->GetCurrentBackBufferIndex();
 
 	// Create descriptor heaps.

diff --git a/Samples/D3D12HelloWorld/src/HelloTriangle/D3D12HelloTriangle.cpp b/Samples/D3D12HelloWorld/src/HelloTriangle/D3D12HelloTriangle.cpp
@@ -101,6 +101,9 @@ void D3D12HelloTriangle::LoadPipeline()
 
 	ThrowIfFailed(swapChain.As(&m_swapChain));
 
+	// This sample does not support fullscreen transitions.
+	ThrowIfFailed(factory->MakeWindowAssociation(m_hwnd, DXGI_MWA_NO_ALT_ENTER));
+
 	m_frameIndex = m_swapChain->GetCurrentBackBufferIndex();
 
 	// Create descriptor heaps.

diff --git a/Samples/D3D12HelloWorld/src/HelloWindow/D3D12HelloWindow.cpp b/Samples/D3D12HelloWorld/src/HelloWindow/D3D12HelloWindow.cpp
@@ -93,6 +93,9 @@ void D3D12HelloWindow::LoadPipeline()
 
 	ThrowIfFailed(swapChain.As(&m_swapChain));
 
+	// This sample does not support fullscreen transitions.
+	ThrowIfFailed(factory->MakeWindowAssociation(m_hwnd, DXGI_MWA_NO_ALT_ENTER));
+
 	m_frameIndex = m_swapChain->GetCurrentBackBufferIndex();
 
 	// Create descriptor heaps.

diff --git a/Samples/D3D12Multithreading/src/D3D12Multithreading.cpp b/Samples/D3D12Multithreading/src/D3D12Multithreading.cpp
@@ -120,6 +120,9 @@ void D3D12Multithreading::LoadPipeline()
 
 	ThrowIfFailed(swapChain.As(&m_swapChain));
 
+	// This sample does not support fullscreen transitions.
+	ThrowIfFailed(factory->MakeWindowAssociation(m_hwnd, DXGI_MWA_NO_ALT_ENTER));
+
 	m_frameIndex = m_swapChain->GetCurrentBackBufferIndex();
 
 	// Create descriptor heaps.

diff --git a/Samples/D3D12PipelineStateCache/src/D3D12PipelineStateCache.cpp b/Samples/D3D12PipelineStateCache/src/D3D12PipelineStateCache.cpp
@@ -119,6 +119,9 @@ void D3D12PipelineStateCache::LoadPipeline()
 
 	ThrowIfFailed(swapChain.As(&m_swapChain));
 
+	// This sample does not support fullscreen transitions.
+	ThrowIfFailed(factory->MakeWindowAssociation(m_hwnd, DXGI_MWA_NO_ALT_ENTER));
+
 	m_frameIndex = m_swapChain->GetCurrentBackBufferIndex();
 	m_swapChainEvent = m_swapChain->GetFrameLatencyWaitableObject();
 

diff --git a/Samples/D3D12PredicationQueries/src/D3D12PredicationQueries.cpp b/Samples/D3D12PredicationQueries/src/D3D12PredicationQueries.cpp
@@ -104,6 +104,9 @@ void D3D12PredicationQueries::LoadPipeline()
 
 	ThrowIfFailed(swapChain.As(&m_swapChain));
 
+	// This sample does not support fullscreen transitions.
+	ThrowIfFailed(factory->MakeWindowAssociation(m_hwnd, DXGI_MWA_NO_ALT_ENTER));
+
 	m_frameIndex = m_swapChain->GetCurrentBackBufferIndex();
 
 	// Create descriptor heaps.

diff --git a/Samples/D3D12nBodyGravity/src/D3D12nBodyGravity.cpp b/Samples/D3D12nBodyGravity/src/D3D12nBodyGravity.cpp
@@ -135,6 +135,9 @@ void D3D12nBodyGravity::LoadPipeline()
 
 	ThrowIfFailed(swapChain.As(&m_swapChain));
 
+	// This sample does not support fullscreen transitions.
+	ThrowIfFailed(factory->MakeWindowAssociation(m_hwnd, DXGI_MWA_NO_ALT_ENTER));
+
 	m_frameIndex = m_swapChain->GetCurrentBackBufferIndex();
 
 	m_swapChainEvent = m_swapChain->GetFrameLatencyWaitableObject();