From 3ce42d33888d4c7bcf5a27e51882315f00c287ac Mon Sep 17 00:00:00 2001 From: Egor Date: Fri, 9 Feb 2018 22:57:26 -0800 Subject: Replaced #ifdef PLATFORM_XXX with #if PLATFORM_XXX --- Graphics/GraphicsEngineD3D11/include/pch.h | 4 ++-- Graphics/GraphicsEngineD3D11/src/RenderDeviceFactoryD3D11.cpp | 2 +- Graphics/GraphicsEngineD3D11/src/SwapChainD3D11Impl.cpp | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'Graphics/GraphicsEngineD3D11') diff --git a/Graphics/GraphicsEngineD3D11/include/pch.h b/Graphics/GraphicsEngineD3D11/include/pch.h index 9a33b12a..91105ad7 100644 --- a/Graphics/GraphicsEngineD3D11/include/pch.h +++ b/Graphics/GraphicsEngineD3D11/include/pch.h @@ -38,9 +38,9 @@ #include #include #include -#if defined(PLATFORM_WIN32) +#if PLATFORM_WIN32 #include -#elif defined(PLATFORM_UNIVERSAL_WINDOWS) +#elif PLATFORM_UNIVERSAL_WINDOWS #include #endif diff --git a/Graphics/GraphicsEngineD3D11/src/RenderDeviceFactoryD3D11.cpp b/Graphics/GraphicsEngineD3D11/src/RenderDeviceFactoryD3D11.cpp index c82385a4..34c0873a 100644 --- a/Graphics/GraphicsEngineD3D11/src/RenderDeviceFactoryD3D11.cpp +++ b/Graphics/GraphicsEngineD3D11/src/RenderDeviceFactoryD3D11.cpp @@ -128,7 +128,7 @@ void EngineFactoryD3D11Impl::CreateDeviceAndContextsD3D11( const EngineD3D11Attr // description. All applications are assumed to support 9.1 unless otherwise stated. D3D_FEATURE_LEVEL featureLevels[] = { -#ifdef PLATFORM_UNIVERSAL_WINDOWS +#if PLATFORM_UNIVERSAL_WINDOWS D3D_FEATURE_LEVEL_11_1, #endif D3D_FEATURE_LEVEL_11_0, diff --git a/Graphics/GraphicsEngineD3D11/src/SwapChainD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/SwapChainD3D11Impl.cpp index 76c7d928..01f4623d 100644 --- a/Graphics/GraphicsEngineD3D11/src/SwapChainD3D11Impl.cpp +++ b/Graphics/GraphicsEngineD3D11/src/SwapChainD3D11Impl.cpp @@ -40,7 +40,7 @@ SwapChainD3D11Impl::SwapChainD3D11Impl(IReferenceCounters *pRefCounters, TSwapChainBase(pRefCounters, pRenderDeviceD3D11, pDeviceContextD3D11, SCDesc) { -#ifdef PLATFORM_WIN32 +#if PLATFORM_WIN32 auto hWnd = reinterpret_cast(pNativeWndHandle); if( m_SwapChainDesc.Width == 0 || m_SwapChainDesc.Height == 0 ) @@ -79,7 +79,7 @@ SwapChainD3D11Impl::SwapChainD3D11Impl(IReferenceCounters *pRefCounters, CComPtr pSwapChain1; -#if defined( PLATFORM_WIN32 ) +#if PLATFORM_WIN32 // This sequence obtains the DXGI factory that was used to create the Direct3D device above. CComPtr pDXGIDevice; pDevice->QueryInterface(__uuidof(IDXGIDevice), reinterpret_cast( static_cast(&pDXGIDevice) ) ); @@ -91,7 +91,7 @@ SwapChainD3D11Impl::SwapChainD3D11Impl(IReferenceCounters *pRefCounters, CHECK_D3D_RESULT_THROW( pDXGIFactory->CreateSwapChainForHwnd(pDevice, hWnd, &swapChainDesc, nullptr, nullptr, &pSwapChain1), "Failed to create DXGI swap chain" ); -#elif defined( PLATFORM_UNIVERSAL_WINDOWS ) +#elif PLATFORM_UNIVERSAL_WINDOWS CComPtr pDXGIDevice; pDevice->QueryInterface(__uuidof(IDXGIDevice3), reinterpret_cast(static_cast(&pDXGIDevice))); @@ -173,7 +173,7 @@ IMPLEMENT_QUERY_INTERFACE( SwapChainD3D11Impl, IID_SwapChainD3D11, TSwapChainBas void SwapChainD3D11Impl::Present() { UINT SyncInterval = 0; -#ifdef PLATFORM_UNIVERSAL_WINDOWS +#if PLATFORM_UNIVERSAL_WINDOWS SyncInterval = 1; // Interval 0 is not supported on Windows Phone #endif -- cgit v1.2.3