Replaced #ifdef PLATFORM_XXX with #if PLATFORM_XXX

TheMostDiligent · TheMostDiligent · commit 3ce42d33888d · 2018-02-09T22:57:26.000-08:00
diff --git a/Common/interface/StringTools.h b/Common/interface/StringTools.h
@@ -28,6 +28,7 @@
 #include <locale>
 #include <algorithm>
 #include <cctype>
+#include <string.h>
 #include "DebugUtilities.h"
 
 namespace Diligent
@@ -69,7 +70,7 @@ inline std::wstring WidenString(const std::string &Str)
 
 inline int StrCmpNoCase(const char* Str1, const char* Str2, size_t NumChars)
 {
-#if defined(PLATFORM_ANDROID) || defined(PLATFORM_LINUX) || defined(PLATFORM_MACOS) || defined(PLATFORM_IOS)
+#if PLATFORM_ANDROID || PLATFORM_LINUX || PLATFORM_MACOS || PLATFORM_IOS
 #   define _strnicmp strncasecmp
 #endif
 
@@ -78,7 +79,7 @@ inline int StrCmpNoCase(const char* Str1, const char* Str2, size_t NumChars)
 
 inline int StrCmpNoCase(const char* Str1, const char* Str2)
 {
-#if defined(PLATFORM_ANDROID) || defined(PLATFORM_LINUX) || defined(PLATFORM_MACOS) || defined(PLATFORM_IOS)
+#if PLATFORM_ANDROID || PLATFORM_LINUX || PLATFORM_MACOS || PLATFORM_IOS
 #   define _stricmp strcasecmp
 #endif
 
diff --git a/Graphics/GraphicsEngineD3D11/include/pch.h b/Graphics/GraphicsEngineD3D11/include/pch.h
@@ -38,9 +38,9 @@
 #include <vector>
 #include <exception>
 #include <algorithm>
-#if defined(PLATFORM_WIN32)
+#if PLATFORM_WIN32
     #include <d3d11.h>
-#elif defined(PLATFORM_UNIVERSAL_WINDOWS)
+#elif PLATFORM_UNIVERSAL_WINDOWS
     #include <d3d11_2.h>
 #endif
 
diff --git 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
@@ -40,7 +40,7 @@ SwapChainD3D11Impl::SwapChainD3D11Impl(IReferenceCounters *pRefCounters,
     TSwapChainBase(pRefCounters, pRenderDeviceD3D11, pDeviceContextD3D11, SCDesc)
 {
 
-#ifdef PLATFORM_WIN32
+#if PLATFORM_WIN32
     auto hWnd = reinterpret_cast<HWND>(pNativeWndHandle);
 
     if( m_SwapChainDesc.Width == 0 || m_SwapChainDesc.Height == 0 )
@@ -79,7 +79,7 @@ SwapChainD3D11Impl::SwapChainD3D11Impl(IReferenceCounters *pRefCounters,
 
     CComPtr<IDXGISwapChain1> pSwapChain1;
 
-#if defined( PLATFORM_WIN32 )
+#if PLATFORM_WIN32
 	// This sequence obtains the DXGI factory that was used to create the Direct3D device above.
 	CComPtr<IDXGIDevice> pDXGIDevice;
 	pDevice->QueryInterface(__uuidof(IDXGIDevice), reinterpret_cast<void**>( static_cast<IDXGIDevice**>(&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<IDXGIDevice3> pDXGIDevice;
 	pDevice->QueryInterface(__uuidof(IDXGIDevice3), reinterpret_cast<void**>(static_cast<IDXGIDevice3**>(&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
 
diff --git a/Graphics/GraphicsEngineD3D12/src/SwapChainD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/SwapChainD3D12Impl.cpp
@@ -41,7 +41,7 @@ SwapChainD3D12Impl::SwapChainD3D12Impl(IReferenceCounters *pRefCounters,
     m_pBackBufferRTV(STD_ALLOCATOR_RAW_MEM(RefCntAutoPtr<ITextureView>, GetRawAllocator(), "Allocator for vector<RefCntAutoPtr<ITextureView>>"))
 {
 
-#ifdef PLATFORM_WIN32
+#if PLATFORM_WIN32
     auto hWnd = reinterpret_cast<HWND>(pNativeWndHandle);
 
     if( m_SwapChainDesc.Width == 0 || m_SwapChainDesc.Height == 0 )
@@ -82,14 +82,14 @@ SwapChainD3D12Impl::SwapChainD3D12Impl(IReferenceCounters *pRefCounters,
     CHECK_D3D_RESULT_THROW(hr, "Failed to create DXGI factory")
 
     auto *pd3d12CmdQueue = pRenderDeviceD3D12->GetCmdQueue()->GetD3D12CommandQueue();
-#if defined( PLATFORM_WIN32 )
+#if PLATFORM_WIN32
     hr = factory->CreateSwapChainForHwnd(pd3d12CmdQueue, hWnd, &swapChainDesc, nullptr, nullptr, &pSwapChain1);
     CHECK_D3D_RESULT_THROW( hr, "Failed to create Swap Chain" );
 
 	// This sample does not support fullscreen transitions.
 	hr = factory->MakeWindowAssociation(hWnd, DXGI_MWA_NO_WINDOW_CHANGES | DXGI_MWA_NO_ALT_ENTER);
 
-#elif defined( PLATFORM_UNIVERSAL_WINDOWS )
+#elif PLATFORM_UNIVERSAL_WINDOWS
 
     hr = factory->CreateSwapChainForCoreWindow(
 		pd3d12CmdQueue,
@@ -168,7 +168,7 @@ IMPLEMENT_QUERY_INTERFACE( SwapChainD3D12Impl, IID_SwapChainD3D12, TSwapChainBas
 void SwapChainD3D12Impl::Present()
 {
     UINT SyncInterval = 0;
-#ifdef PLATFORM_UNIVERSAL_WINDOWS
+#if PLATFORM_UNIVERSAL_WINDOWS
     SyncInterval = 1; // Interval 0 is not supported on Windows Phone 
 #endif
 
@@ -196,7 +196,7 @@ void SwapChainD3D12Impl::Present()
     pDeviceD3D12->FinishFrame();
 
 #if 0
-#ifdef PLATFORM_UNIVERSAL_WINDOWS
+#if PLATFORM_UNIVERSAL_WINDOWS
     // A successful Present call for DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL SwapChains unbinds 
     // backbuffer 0 from all GPU writeable bind points.
     // We need to rebind all render targets to make sure that
diff --git a/Graphics/GraphicsEngineD3DBase/src/ShaderD3DBase.cpp b/Graphics/GraphicsEngineD3DBase/src/ShaderD3DBase.cpp
@@ -120,7 +120,7 @@ HRESULT CompileShader( const char* Source,
             auto ErrorDesc = errorss.str();
             OutputDebugStringW( ErrorDesc.c_str() );
 			if( FAILED(hr) 
-#ifdef PLATFORM_WIN32
+#if PLATFORM_WIN32
                 && IDRETRY != MessageBoxW( NULL, ErrorDesc.c_str() , L"FX Error", MB_ICONERROR | (Source == nullptr ? MB_ABORTRETRYIGNORE : 0) ) 
 #endif
                 )
diff --git a/Graphics/GraphicsEngineOpenGL/include/GLContext.h b/Graphics/GraphicsEngineOpenGL/include/GLContext.h
@@ -23,15 +23,15 @@
 
 #pragma once
 
-#if defined(PLATFORM_WIN32)
+#if PLATFORM_WIN32
 #   include "GLContextWindows.h"
-#elif defined(PLATFORM_ANDROID)
+#elif PLATFORM_ANDROID
 #   include "GLContextAndroid.h"
-#elif defined(PLATFORM_LINUX)
+#elif PLATFORM_LINUX
 #   include "GLContextLinux.h"
-#elif defined(PLATFORM_MACOS)
+#elif PLATFORM_MACOS
 #   include "GLContextMacOS.h"
-#elif defined(PLATFORM_IOS)
+#elif PLATFORM_IOS
 #   include "GLContextIOS.h"
 #else
 #   error Unsupported platform
diff --git a/Graphics/GraphicsEngineOpenGL/include/pch.h b/Graphics/GraphicsEngineOpenGL/include/pch.h
@@ -35,7 +35,7 @@
 #include <unordered_set>
 #include <algorithm>
 
-#if defined(PLATFORM_WIN32)
+#if PLATFORM_WIN32
 
 #   ifndef GLEW_STATIC
 #       define GLEW_STATIC // Must be defined to use static version of glew
@@ -46,7 +46,7 @@
 #   include "GL/wglew.h"
 #   include <GL/GL.h>
 
-#elif defined(PLATFORM_LINUX)
+#elif PLATFORM_LINUX
 
 #   ifndef GLEW_STATIC
 #       define GLEW_STATIC // Must be defined to use static version of glew
@@ -75,7 +75,7 @@
 #       undef Success
 #   endif
 
-#elif defined(PLATFORM_MACOS)
+#elif PLATFORM_MACOS
 
 #   ifndef GLEW_STATIC
 #       define GLEW_STATIC // Must be defined to use static version of glew
@@ -86,14 +86,14 @@
 
 #   include "GL/glew.h"
 
-#elif defined(PLATFORM_ANDROID)
+#elif PLATFORM_ANDROID
 
 #   include <GLES3/gl3.h>
 #   include <GLES3/gl3ext.h>
     // GLStubs must be included after GLFeatures!
 #   include "GLStubsAndroid.h"
 
-#elif defined(PLATFORM_IOS)
+#elif PLATFORM_IOS
 
 #   include <OpenGLES/ES3/gl.h>
 #   include <OpenGLES/ES3/glext.h>
diff --git a/Graphics/GraphicsEngineOpenGL/interface/BaseInterfacesGL.h b/Graphics/GraphicsEngineOpenGL/interface/BaseInterfacesGL.h
@@ -23,19 +23,19 @@
 
 #pragma once
 
-#if defined(PLATFORM_ANDROID)
+#if PLATFORM_ANDROID
     #include "RenderDeviceGLES.h"
     namespace Diligent
     {
         using IGLDeviceBaseInterface = IRenderDeviceGLES;
     }
-#elif defined(PLATFORM_WIN32) || defined(PLATFORM_LINUX) || defined(PLATFORM_MACOS)
+#elif PLATFORM_WIN32 || PLATFORM_LINUX || PLATFORM_MACOS
     #include "RenderDeviceGL.h"
     namespace Diligent
     {
         using IGLDeviceBaseInterface = IRenderDeviceGL;
     }
-#elif defined(PLATFORM_IOS)
+#elif PLATFORM_IOS
     #include "RenderDeviceGL.h"
     namespace Diligent
     {
diff --git a/Graphics/GraphicsEngineOpenGL/interface/RenderDeviceFactoryOpenGL.h b/Graphics/GraphicsEngineOpenGL/interface/RenderDeviceFactoryOpenGL.h
@@ -32,11 +32,11 @@
 #include "HLSL2GLSLConverter.h"
 #include "EngineGLAttribs.h"
 
-#if defined(PLATFORM_WIN32) || defined(PLATFORM_UNIVERSAL_WINDOWS)
+#if PLATFORM_WIN32 || PLATFORM_UNIVERSAL_WINDOWS
 
 #   define API_QUALIFIER
 
-#elif defined(PLATFORM_ANDROID) || defined(PLATFORM_LINUX) || defined(PLATFORM_MACOS) || defined(PLATFORM_IOS)
+#elif PLATFORM_ANDROID || PLATFORM_LINUX || PLATFORM_MACOS || PLATFORM_IOS
 
 #   ifdef ENGINE_DLL
 #       ifdef BUILDING_DLL
@@ -74,7 +74,7 @@ class IEngineFactoryOpenGL
 extern "C"
 {
 
-#if defined(ENGINE_DLL) && (defined(PLATFORM_WIN32) || defined(PLATFORM_UNIVERSAL_WINDOWS))
+#if ENGINE_DLL && (PLATFORM_WIN32 || PLATFORM_UNIVERSAL_WINDOWS)
 
     typedef Diligent::IEngineFactoryOpenGL* (*GetEngineFactoryOpenGLType)();
 
diff --git a/Graphics/GraphicsEngineOpenGL/src/GLContextState.cpp b/Graphics/GraphicsEngineOpenGL/src/GLContextState.cpp
@@ -59,7 +59,7 @@ namespace Diligent
 
     void GLContextState::Invalidate()
     {
-#if !defined(PLATFORM_ANDROID)
+#if !PLATFORM_ANDROID
         // On Android this results in OpenGL error, so we will not
         // clear the barriers. All the required barriers will be
         // executed next frame when needed
diff --git a/Graphics/GraphicsEngineOpenGL/src/RenderDeviceFactoryOpenGL.cpp b/Graphics/GraphicsEngineOpenGL/src/RenderDeviceFactoryOpenGL.cpp
@@ -31,26 +31,26 @@
 #include "EngineMemory.h"
 #include "HLSL2GLSLConverterObject.h"
 
-#ifdef PLATFORM_IOS
+#if PLATFORM_IOS
 #   include "SwapChainGLIOS.h"
 #else
 #   include "SwapChainGLImpl.h"
 #endif
 
-#ifdef PLATFORM_ANDROID
+#if PLATFORM_ANDROID
 #   include "RenderDeviceGLESImpl.h"
 #endif
 
 namespace Diligent
 {
 
-#if defined(PLATFORM_WIN32) || defined(PLATFORM_UNIVERSAL_WINDOWS) || defined(PLATFORM_LINUX) || defined(PLATFORM_MACOS)
+#if PLATFORM_WIN32 || PLATFORM_UNIVERSAL_WINDOWS || PLATFORM_LINUX || PLATFORM_MACOS
     typedef RenderDeviceGLImpl TRenderDeviceGLImpl;
     typedef SwapChainGLImpl TSwapChain;
-#elif defined(PLATFORM_ANDROID)
+#elif PLATFORM_ANDROID
     typedef RenderDeviceGLESImpl TRenderDeviceGLImpl;
     typedef SwapChainGLImpl TSwapChain;
-#elif defined(PLATFORM_IOS)
+#elif PLATFORM_IOS
     typedef RenderDeviceGLImpl TRenderDeviceGLImpl;
     typedef SwapChainGLIOS TSwapChain;
 #else
diff --git a/Graphics/GraphicsEngineOpenGL/src/ShaderGLImpl.cpp b/Graphics/GraphicsEngineOpenGL/src/ShaderGLImpl.cpp
@@ -47,17 +47,17 @@ ShaderGLImpl::ShaderGLImpl(IReferenceCounters *pRefCounters, RenderDeviceGLImpl
 
     String Settings;
     
-#if defined(PLATFORM_WIN32) || defined(PLATFORM_LINUX)
+#if PLATFORM_WIN32 || PLATFORM_LINUX
     Settings.append(
         "#version 430 core\n"
         "#define DESKTOP_GL 1\n"
     );
-#elif defined(PLATFORM_MACOS)
+#elif PLATFORM_MACOS
     Settings.append(
         "#version 410 core\n"
         "#define DESKTOP_GL 1\n"
     );
-#elif defined(PLATFORM_IOS)
+#elif PLATFORM_IOS
     Settings.append(
         "#version 300 es\n"
         "#extension GL_EXT_separate_shader_objects : enable\n"
diff --git a/Graphics/GraphicsEngineOpenGL/src/SwapChainGLImpl.cpp b/Graphics/GraphicsEngineOpenGL/src/SwapChainGLImpl.cpp
@@ -35,13 +35,13 @@ SwapChainGLImpl::SwapChainGLImpl(IReferenceCounters *pRefCounters,
                                  DeviceContextGLImpl* pImmediateContextGL) : 
     TSwapChainBase( pRefCounters, pRenderDeviceGL, pImmediateContextGL, SCDesc)
 {
-#if defined(PLATFORM_WIN32)
+#if PLATFORM_WIN32
     HWND hWnd = reinterpret_cast<HWND>(InitAttribs.pNativeWndHandle);
     RECT rc;
     GetClientRect(hWnd, &rc);
     m_SwapChainDesc.Width = rc.right - rc.left;
     m_SwapChainDesc.Height = rc.bottom - rc.top;
-#elif defined(PLATFORM_LINUX)
+#elif PLATFORM_LINUX
     auto wnd = static_cast<Window>(reinterpret_cast<size_t>(InitAttribs.pNativeWndHandle));
     auto display = reinterpret_cast<Display*>(InitAttribs.pDisplay);
 
@@ -50,11 +50,11 @@ SwapChainGLImpl::SwapChainGLImpl(IReferenceCounters *pRefCounters,
 
     m_SwapChainDesc.Width = XWndAttribs.width;
     m_SwapChainDesc.Height = XWndAttribs.height;
-#elif defined(PLATFORM_ANDROID)
+#elif PLATFORM_ANDROID
     auto &GLContext = pRenderDeviceGL->m_GLContext;
     m_SwapChainDesc.Width = GLContext.GetScreenWidth();
     m_SwapChainDesc.Height = GLContext.GetScreenHeight();
-#elif defined(PLATFORM_MACOS)
+#elif PLATFORM_MACOS
     //Set dummy width and height until resize is called by the app
     m_SwapChainDesc.Width = 1024;
     m_SwapChainDesc.Height = 768;
@@ -73,9 +73,9 @@ void SwapChainGLImpl::Present()
 {
     auto *pDeviceGL = ValidatedCast<RenderDeviceGLImpl>(m_pRenderDevice.RawPtr());
     auto &GLContext = pDeviceGL->m_GLContext;
-#if defined(PLATFORM_WIN32) || defined(PLATFORM_LINUX) ||defined(PLATFORM_ANDROID)
+#if PLATFORM_WIN32 || PLATFORM_LINUX || PLATFORM_ANDROID
     GLContext.SwapBuffers();
-#elif defined(PLATFORM_MACOS)
+#elif PLATFORM_MACOS
     LOG_ERROR("Swap buffers operation must be performed by the app on MacOS");
 #else
 #   error Unsupported platform
diff --git a/Platforms/Basic/src/StandardFile.cpp b/Platforms/Basic/src/StandardFile.cpp
@@ -29,7 +29,7 @@ StandardFile::StandardFile(const FileOpenAttribs &OpenAttribs, Diligent::Char Sl
     BasicFile(OpenAttribs, SlashSymbol),
     m_pFile(nullptr)
 {
-#if defined(PLATFORM_LINUX) || defined(PLATFORM_MACOS) || defined(PLATFORM_IOS)
+#if PLATFORM_LINUX || PLATFORM_MACOS || PLATFORM_IOS
     auto OpenModeStr = GetOpenModeStr();
     m_pFile = fopen(m_OpenAttribs.strFilePath, OpenModeStr.c_str());
     if (m_pFile == nullptr)
diff --git a/Platforms/interface/Atomics.h b/Platforms/interface/Atomics.h
@@ -25,7 +25,7 @@
 
 #include "PlatformDefinitions.h"
 
-#if defined( PLATFORM_WIN32 ) || defined( PLATFORM_UNIVERSAL_WINDOWS )
+#if PLATFORM_WIN32 || PLATFORM_UNIVERSAL_WINDOWS
 
     #include "Win32Atomics.h"
     typedef WindowsAtomics Atomics;
diff --git a/Platforms/interface/FileSystem.h b/Platforms/interface/FileSystem.h
diff --git a/Platforms/interface/PlatformDebug.h b/Platforms/interface/PlatformDebug.h
diff --git a/Platforms/interface/PlatformDefinitions.h b/Platforms/interface/PlatformDefinitions.h
diff --git a/Platforms/interface/PlatformMisc.h b/Platforms/interface/PlatformMisc.h

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ void EngineFactoryD3D11Impl::CreateDeviceAndContextsD3D11( const EngineD3D11Attr`
`128`	`128`	`// description. All applications are assumed to support 9.1 unless otherwise stated.`
`129`	`129`	`D3D_FEATURE_LEVEL featureLevels[] =`
`130`	`130`	`{`
`131`		`-#ifdef PLATFORM_UNIVERSAL_WINDOWS`
	`131`	`+#if PLATFORM_UNIVERSAL_WINDOWS`
`132`	`132`	`D3D_FEATURE_LEVEL_11_1,`
`133`	`133`	`#endif`
`134`	`134`	`D3D_FEATURE_LEVEL_11_0,`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ HRESULT CompileShader( const char* Source,`
`120`	`120`	`auto ErrorDesc = errorss.str();`
`121`	`121`	`OutputDebugStringW( ErrorDesc.c_str() );`
`122`	`122`	`if( FAILED(hr)`
`123`		`-#ifdef PLATFORM_WIN32`
	`123`	`+#if PLATFORM_WIN32`
`124`	`124`	`&& IDRETRY != MessageBoxW( NULL, ErrorDesc.c_str() , L"FX Error", MB_ICONERROR \| (Source == nullptr ? MB_ABORTRETRYIGNORE : 0) )`
`125`	`125`	`#endif`
`126`	`126`	`)`
Original file line number	Diff line number	Diff line change
`@@ -23,19 +23,19 @@`
`23`	`23`
`24`	`24`	`#pragma once`
`25`	`25`
`26`		`-#if defined(PLATFORM_ANDROID)`
	`26`	`+#if PLATFORM_ANDROID`
`27`	`27`	`#include "RenderDeviceGLES.h"`
`28`	`28`	`namespace Diligent`
`29`	`29`	`{`
`30`	`30`	`using IGLDeviceBaseInterface = IRenderDeviceGLES;`
`31`	`31`	`}`
`32`		`-#elif defined(PLATFORM_WIN32) \|\| defined(PLATFORM_LINUX) \|\| defined(PLATFORM_MACOS)`
	`32`	`+#elif PLATFORM_WIN32 \|\| PLATFORM_LINUX \|\| PLATFORM_MACOS`
`33`	`33`	`#include "RenderDeviceGL.h"`
`34`	`34`	`namespace Diligent`
`35`	`35`	`{`
`36`	`36`	`using IGLDeviceBaseInterface = IRenderDeviceGL;`
`37`	`37`	`}`
`38`		`-#elif defined(PLATFORM_IOS)`
	`38`	`+#elif PLATFORM_IOS`
`39`	`39`	`#include "RenderDeviceGL.h"`
`40`	`40`	`namespace Diligent`
`41`	`41`	`{`