From 57b4ae994d2c85f23bf330e99e74fa7f77e13bd6 Mon Sep 17 00:00:00 2001
From: walbourn_cp <SND\walbourn_cp>
Date: Thu, 8 May 2014 13:44:39 -0700
Subject: [PATCH] Removed all use of MONOLITHIC driver variable

---
 DDSTextureLoader/DDSTextureLoader.cpp | 4 +---
 DDSTextureLoader/DDSTextureLoader.h   | 2 +-
 ScreenGrab/ScreenGrab.cpp             | 4 +---
 ScreenGrab/ScreenGrab.h               | 2 +-
 WICTextureLoader/WICTextureLoader.h   | 2 +-
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/DDSTextureLoader/DDSTextureLoader.cpp b/DDSTextureLoader/DDSTextureLoader.cpp
index 50e1ef5..fed698c 100644
--- a/DDSTextureLoader/DDSTextureLoader.cpp
+++ b/DDSTextureLoader/DDSTextureLoader.cpp
@@ -416,12 +416,10 @@ static size_t BitsPerPixel( _In_ DXGI_FORMAT fmt )
     case DXGI_FORMAT_R10G10B10_6E4_A2_FLOAT:
         return 32;
 
-#if MONOLITHIC
     case DXGI_FORMAT_D16_UNORM_S8_UINT:
     case DXGI_FORMAT_R16_UNORM_X8_TYPELESS:
     case DXGI_FORMAT_X16_TYPELESS_G8_UINT:
         return 24;
-#endif
 
 #endif // _XBOX_ONE && _TITLE
 
@@ -505,7 +503,7 @@ static void GetSurfaceInfo( _In_ size_t width,
         bpe = 4;
         break;
 
-#if defined(_XBOX_ONE) && defined(_TITLE) && MONOLITHIC
+#if defined(_XBOX_ONE) && defined(_TITLE)
 
     case DXGI_FORMAT_D16_UNORM_S8_UINT:
     case DXGI_FORMAT_R16_UNORM_X8_TYPELESS:
diff --git a/DDSTextureLoader/DDSTextureLoader.h b/DDSTextureLoader/DDSTextureLoader.h
index fa6b48a..bf9548b 100644
--- a/DDSTextureLoader/DDSTextureLoader.h
+++ b/DDSTextureLoader/DDSTextureLoader.h
@@ -22,7 +22,7 @@
 #pragma once
 #endif
 
-#if defined(_XBOX_ONE) && defined(_TITLE) && MONOLITHIC
+#if defined(_XBOX_ONE) && defined(_TITLE)
 #include <d3d11_x.h>
 #define DCOMMON_H_INCLUDED
 #define NO_D3D11_DEBUG_NAME
diff --git a/ScreenGrab/ScreenGrab.cpp b/ScreenGrab/ScreenGrab.cpp
index 45d9b9b..d33808d 100644
--- a/ScreenGrab/ScreenGrab.cpp
+++ b/ScreenGrab/ScreenGrab.cpp
@@ -346,12 +346,10 @@ static size_t BitsPerPixel( _In_ DXGI_FORMAT fmt )
     case DXGI_FORMAT_R10G10B10_6E4_A2_FLOAT:
         return 32;
 
-#if MONOLITHIC
     case DXGI_FORMAT_D16_UNORM_S8_UINT:
     case DXGI_FORMAT_R16_UNORM_X8_TYPELESS:
     case DXGI_FORMAT_X16_TYPELESS_G8_UINT:
         return 24;
-#endif
 
 #endif // _XBOX_ONE && _TITLE
 
@@ -471,7 +469,7 @@ static void GetSurfaceInfo( _In_ size_t width,
         bpe = 4;
         break;
 
-#if defined(_XBOX_ONE) && defined(_TITLE) && MONOLITHIC
+#if defined(_XBOX_ONE) && defined(_TITLE)
 
     case DXGI_FORMAT_D16_UNORM_S8_UINT:
     case DXGI_FORMAT_R16_UNORM_X8_TYPELESS:
diff --git a/ScreenGrab/ScreenGrab.h b/ScreenGrab/ScreenGrab.h
index f58f5eb..c228dd4 100644
--- a/ScreenGrab/ScreenGrab.h
+++ b/ScreenGrab/ScreenGrab.h
@@ -23,7 +23,7 @@
 #pragma once
 #endif
 
-#if defined(_XBOX_ONE) && defined(_TITLE) && MONOLITHIC
+#if defined(_XBOX_ONE) && defined(_TITLE)
 #include <d3d11_x.h>
 #define DCOMMON_H_INCLUDED
 #define NO_D3D11_DEBUG_NAME
diff --git a/WICTextureLoader/WICTextureLoader.h b/WICTextureLoader/WICTextureLoader.h
index fd21bc2..4114926 100644
--- a/WICTextureLoader/WICTextureLoader.h
+++ b/WICTextureLoader/WICTextureLoader.h
@@ -33,7 +33,7 @@
 #error WIC is not supported on Windows Phone 8.0
 #endif
 
-#if defined(_XBOX_ONE) && defined(_TITLE) && MONOLITHIC
+#if defined(_XBOX_ONE) && defined(_TITLE)
 #include <d3d11_x.h>
 #define DCOMMON_H_INCLUDED
 #define NO_D3D11_DEBUG_NAME