encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WinRT: minor rotation/orientation code cleanup in the d3d11 renderer

This commit is contained in:
David Ludwig 2013-12-25 23:45:07 -05:00
parent b93ab1e6a3
commit 8b2694f986
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/render/direct3d11/SDL_render_d3d11.cpp
View File

@ -1062,6 +1062,18 @@ D3D11_GetRotationForOrientation(Windows::Graphics::Display::DisplayOrientations
} }
} }
static bool
D3D11_IsDisplayRotated90Degrees(Windows::Graphics::Display::DisplayOrientations orientation)
{
switch (D3D11_GetRotationForOrientation(orientation)) {
case DXGI_MODE_ROTATION_ROTATE90:
case DXGI_MODE_ROTATION_ROTATE270:
return true;
default:
return false;
}
}
// Initialize all resources that change when the window's size changes. // Initialize all resources that change when the window's size changes.
// TODO, WinRT: get D3D11_CreateWindowSizeDependentResources working on Win32 // TODO, WinRT: get D3D11_CreateWindowSizeDependentResources working on Win32
HRESULT HRESULT
@ -1108,9 +1120,7 @@ D3D11_CreateWindowSizeDependentResources(SDL_Renderer * renderer)
#if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP #if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
const bool swapDimensions = false; const bool swapDimensions = false;
#else #else
const bool swapDimensions = const bool swapDimensions = D3D11_IsDisplayRotated90Degrees(data->orientation);
data->orientation == DisplayOrientations::Portrait ||
data->orientation == DisplayOrientations::PortraitFlipped;
#endif #endif
data->renderTargetSize.x = swapDimensions ? windowHeight : windowWidth; data->renderTargetSize.x = swapDimensions ? windowHeight : windowWidth;
data->renderTargetSize.y = swapDimensions ? windowWidth : windowHeight; data->renderTargetSize.y = swapDimensions ? windowWidth : windowHeight;
@ -1687,16 +1697,7 @@ D3D11_UpdateViewport(SDL_Renderer * renderer)
// for Windows Phone devices. // for Windows Phone devices.
// //
SDL_FRect orientationAlignedViewport; SDL_FRect orientationAlignedViewport;
const bool swapDimensions = D3D11_IsDisplayRotated90Degrees(data->orientation);
#if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
const bool swapDimensions =
data->orientation == DisplayOrientations::Landscape ||
data->orientation == DisplayOrientations::LandscapeFlipped;
#else
const bool swapDimensions =
data->orientation == DisplayOrientations::Portrait ||
data->orientation == DisplayOrientations::PortraitFlipped;
#endif
if (swapDimensions) { if (swapDimensions) {
orientationAlignedViewport.x = (float) renderer->viewport.y; orientationAlignedViewport.x = (float) renderer->viewport.y;
orientationAlignedViewport.y = (float) renderer->viewport.x; orientationAlignedViewport.y = (float) renderer->viewport.x;