From d244d7c756aca5ad0fbc8e00b992128014751160 Mon Sep 17 00:00:00 2001 From: David Ludwig Date: Tue, 14 Oct 2014 09:53:46 -0400 Subject: [PATCH] WinRT: fixed bug whereby offscreen-rendered content could get improperly rotated Attributes on the host device's rotation were getting applied to offscreen textures in an invalid manner. This was causing some apps to look different, depending on how the device was rotated. --- src/render/direct3d11/SDL_render_d3d11.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/render/direct3d11/SDL_render_d3d11.c b/src/render/direct3d11/SDL_render_d3d11.c index cd2869600..f99fdb1d5 100644 --- a/src/render/direct3d11/SDL_render_d3d11.c +++ b/src/render/direct3d11/SDL_render_d3d11.c @@ -1329,11 +1329,23 @@ D3D11_IsDisplayRotated90Degrees(DXGI_MODE_ROTATION rotation) } } +static int +D3D11_GetRotationForCurrentRenderTarget(SDL_Renderer * renderer) +{ + D3D11_RenderData *data = (D3D11_RenderData *)renderer->driverdata; + if (data->currentOffscreenRenderTargetView) { + return DXGI_MODE_ROTATION_IDENTITY; + } else { + return data->rotation; + } +} + static int D3D11_GetViewportAlignedD3DRect(SDL_Renderer * renderer, const SDL_Rect * sdlRect, D3D11_RECT * outRect) { D3D11_RenderData *data = (D3D11_RenderData *) renderer->driverdata; - switch (data->rotation) { + const int rotation = D3D11_GetRotationForCurrentRenderTarget(renderer); + switch (rotation) { case DXGI_MODE_ROTATION_IDENTITY: outRect->left = sdlRect->x; outRect->right = sdlRect->x + sdlRect->w; @@ -2151,6 +2163,7 @@ D3D11_UpdateViewport(SDL_Renderer * renderer) SDL_FRect orientationAlignedViewport; BOOL swapDimensions; D3D11_VIEWPORT viewport; + const int rotation = D3D11_GetRotationForCurrentRenderTarget(renderer); if (renderer->viewport.w == 0 || renderer->viewport.h == 0) { /* If the viewport is empty, assume that it is because @@ -2166,7 +2179,7 @@ D3D11_UpdateViewport(SDL_Renderer * renderer) * default coordinate system) so rotations will be done in the opposite * direction of the DXGI_MODE_ROTATION enumeration. */ - switch (data->rotation) { + switch (rotation) { case DXGI_MODE_ROTATION_IDENTITY: projection = MatrixIdentity(); break; @@ -2217,7 +2230,7 @@ D3D11_UpdateViewport(SDL_Renderer * renderer) * a landscape mode, for all Windows 8/RT devices, or a portrait mode, * for Windows Phone devices. */ - swapDimensions = D3D11_IsDisplayRotated90Degrees(data->rotation); + swapDimensions = D3D11_IsDisplayRotated90Degrees(rotation); if (swapDimensions) { orientationAlignedViewport.x = (float) renderer->viewport.y; orientationAlignedViewport.y = (float) renderer->viewport.x;