Commit 5281f9f1ea8cb898ea6aba769c697da96d7e5248
2014-03-15T13:27:18
Fixed a crash on Windows Phone 8 that occurred after rotating a device This changeset prevents IDXGISwapChain::ResizeBuffers from being invoked on Windows Phone 8, a function that isn't available on the platform (but is available on other Windows platforms). The call would fail, which ultimately led to a crash. This changeset also attempts to make sure that the D3D11 swap chain is created at the correct size, when using Windows Phone 8. Still TODO: make sure rotation-querying works across relevant Windows platforms (that support Direct3D 11.x).
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48
diff --git a/src/render/direct3d11/SDL_render_d3d11.c b/src/render/direct3d11/SDL_render_d3d11.c
index 3a7a7f3..dbffd50 100644
--- a/src/render/direct3d11/SDL_render_d3d11.c
+++ b/src/render/direct3d11/SDL_render_d3d11.c
@@ -1438,30 +1438,24 @@ D3D11_CreateWindowSizeDependentResources(SDL_Renderer * renderer)
ID3D11Texture2D *backBuffer = NULL;
HRESULT result = S_OK;
int w, h;
- BOOL swapDimensions;
/* Release the previous render target view */
D3D11_ReleaseMainRenderTargetView(renderer);
- /* The width and height of the swap chain must be based on the window's
- * landscape-oriented width and height. If the window is in a portrait
- * rotation, the dimensions must be reversed.
+ /* The width and height of the swap chain must be based on the display's
+ * non-rotated size.
*/
SDL_GetWindowSize(renderer->window, &w, &h);
data->rotation = D3D11_GetCurrentRotation();
-
-#if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
- swapDimensions = FALSE;
-#else
- swapDimensions = D3D11_IsDisplayRotated90Degrees(data->rotation);
-#endif
- if (swapDimensions) {
+ if (D3D11_IsDisplayRotated90Degrees(data->rotation)) {
int tmp = w;
w = h;
h = tmp;
}
if (data->swapChain) {
+ /* IDXGISwapChain::ResizeBuffers is not available on Windows Phone 8. */
+#if !defined(__WINRT__) || (WINAPI_FAMILY != WINAPI_FAMILY_PHONE_APP)
/* If the swap chain already exists, resize it. */
result = IDXGISwapChain_ResizeBuffers(data->swapChain,
0,
@@ -1473,6 +1467,7 @@ D3D11_CreateWindowSizeDependentResources(SDL_Renderer * renderer)
WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGISwapChain::ResizeBuffers", result);
goto done;
}
+#endif
} else {
result = D3D11_CreateSwapChain(renderer, w, h);
if (FAILED(result)) {