From 1b16b47523e5d0c606ae04606597fffef949d51a Mon Sep 17 00:00:00 2001
From: Xottab-DUTY <xottab-duty@yandex.ru>
Date: Sun, 21 Oct 2018 20:31:08 +0500
Subject: [PATCH] Changed USE_DX10, USE_DX11, USE_OGL checks to ifndef USE_DX9

---
 src/Layers/xrRender/Blender_Recorder_R2.cpp    |  2 +-
 src/Layers/xrRender/D3DXRenderBase.h           |  4 ++--
 src/Layers/xrRender/DetailManager.h            |  2 +-
 src/Layers/xrRender/DetailManager_VS.cpp       |  4 ++--
 src/Layers/xrRender/FSkinned.cpp               | 14 +++++++-------
 src/Layers/xrRender/HW.h                       |  2 +-
 src/Layers/xrRender/R_Backend.h                | 18 +++++++++---------
 src/Layers/xrRender/R_Backend_DBG.cpp          |  6 +++---
 src/Layers/xrRender/R_Backend_Runtime.cpp      |  4 ++--
 src/Layers/xrRender/ResourceManager.h          |  6 +++---
 src/Layers/xrRender/SH_Atomic.cpp              |  2 +-
 src/Layers/xrRender/SH_Atomic.h                |  2 +-
 src/Layers/xrRender/SH_Texture.h               |  2 +-
 src/Layers/xrRender/Shader.cpp                 |  2 +-
 src/Layers/xrRender/Shader.h                   |  2 +-
 src/Layers/xrRender/ShaderResourceTraits.h     |  4 ++--
 src/Layers/xrRender/SkeletonX.cpp              |  4 ++--
 src/Layers/xrRender/SkeletonX.h                |  4 ++--
 .../xrRender/blenders/Blender_Recorder.cpp     |  2 +-
 .../xrRender/blenders/Blender_Recorder.h       |  6 +++---
 src/Layers/xrRender/dxConsoleRender.cpp        |  2 +-
 src/Layers/xrRender/dxConsoleRender.h          |  2 +-
 src/Layers/xrRender/dxDebugRender.cpp          |  2 +-
 src/Layers/xrRender/dxEnvironmentRender.cpp    |  2 +-
 src/Layers/xrRender/r__dsgraph_build.cpp       | 14 +++++++-------
 src/Layers/xrRender/r__dsgraph_render.cpp      |  8 ++++----
 src/Layers/xrRender/r__dsgraph_types.h         |  4 ++--
 src/Layers/xrRender/r_constants.cpp            |  2 +-
 src/Layers/xrRender/r_constants.h              |  4 ++--
 src/Layers/xrRender/tss.h                      |  2 +-
 src/Layers/xrRender/xrRender_console.cpp       |  4 ++--
 31 files changed, 69 insertions(+), 69 deletions(-)

diff --git a/src/Layers/xrRender/Blender_Recorder_R2.cpp b/src/Layers/xrRender/Blender_Recorder_R2.cpp
index 38397362aa7..e21fc37dc3a 100644
--- a/src/Layers/xrRender/Blender_Recorder_R2.cpp
+++ b/src/Layers/xrRender/Blender_Recorder_R2.cpp
@@ -27,7 +27,7 @@ void CBlender_Compile::r_Pass(LPCSTR _vs, LPCSTR _ps, bool bFog, BOOL bZtest, BO
     SVS* vs = RImplementation.Resources->_CreateVS(_vs);
     dest.ps = ps;
     dest.vs = vs;
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
     SGS* gs = RImplementation.Resources->_CreateGS("null");
     dest.gs = gs;
 #ifdef USE_DX11
diff --git a/src/Layers/xrRender/D3DXRenderBase.h b/src/Layers/xrRender/D3DXRenderBase.h
index 53c14675e2f..5a1f9618029 100644
--- a/src/Layers/xrRender/D3DXRenderBase.h
+++ b/src/Layers/xrRender/D3DXRenderBase.h
@@ -50,7 +50,7 @@ class D3DXRenderBase : public IRender, public pureFrame
 
     // Runtime structures
     xr_vector<R_dsgraph::mapNormalVS::value_type *> nrmVS;
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
     xr_vector<R_dsgraph::mapNormalGS::value_type *> nrmGS;
 #endif //	USE_DX10
     xr_vector<R_dsgraph::mapNormalPS::value_type *> nrmPS;
@@ -60,7 +60,7 @@ class D3DXRenderBase : public IRender, public pureFrame
     xr_vector<R_dsgraph::mapNormalTextures::value_type *> nrmTexturesTemp;
 
     xr_vector<R_dsgraph::mapMatrixVS::value_type *> matVS;
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
     xr_vector<R_dsgraph::mapMatrixGS::value_type *> matGS;
 #endif //	USE_DX10
     xr_vector<R_dsgraph::mapMatrixPS::value_type *> matPS;
diff --git a/src/Layers/xrRender/DetailManager.h b/src/Layers/xrRender/DetailManager.h
index ce93368531a..c20e02a170e 100644
--- a/src/Layers/xrRender/DetailManager.h
+++ b/src/Layers/xrRender/DetailManager.h
@@ -206,7 +206,7 @@ class ECORE_API CDetailManager
     void hw_Load_Shaders();
     void hw_Unload();
     void hw_Render();
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
     void hw_Render_dump(const Fvector4& consts, const Fvector4& wave, const Fvector4& wind, u32 var_id, u32 lod_id);
 #else //	USE_DX10
     void hw_Render_dump(ref_constant array, u32 var_id, u32 lod_id, u32 c_base);
diff --git a/src/Layers/xrRender/DetailManager_VS.cpp b/src/Layers/xrRender/DetailManager_VS.cpp
index eecfed8f6d8..e748645c309 100644
--- a/src/Layers/xrRender/DetailManager_VS.cpp
+++ b/src/Layers/xrRender/DetailManager_VS.cpp
@@ -75,7 +75,7 @@ void CDetailManager::hw_Load_Geom()
     // Fill VB
     {
         vertHW* pV;
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
         vertHW* pVOriginal;
         pVOriginal = xr_alloc<vertHW>(dwVerts);
         pV = pVOriginal;
@@ -117,7 +117,7 @@ void CDetailManager::hw_Load_Geom()
     // Fill IB
     {
         u16* pI;
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
         u16* pIOriginal;
         pIOriginal = xr_alloc<u16>(dwIndices);
         pI = pIOriginal;
diff --git a/src/Layers/xrRender/FSkinned.cpp b/src/Layers/xrRender/FSkinned.cpp
index 28b616b2b5d..95d50308b5b 100644
--- a/src/Layers/xrRender/FSkinned.cpp
+++ b/src/Layers/xrRender/FSkinned.cpp
@@ -355,7 +355,7 @@ void CSkeletonX_PM::Load(const char* N, IReader* data, u32 dwFlags)
     void* _verts_ = data->pointer();
     inherited1::Load(N, data, dwFlags | VLOAD_NOVERTICES);
     GEnv.Render->shader_option_skinning(-1);
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
     _DuplicateIndices(N, data);
 #endif // USE_DX10
     vBase = 0;
@@ -367,14 +367,14 @@ void CSkeletonX_ST::Load(const char* N, IReader* data, u32 dwFlags)
     void* _verts_ = data->pointer();
     inherited1::Load(N, data, dwFlags | VLOAD_NOVERTICES);
     GEnv.Render->shader_option_skinning(-1);
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
     _DuplicateIndices(N, data);
 #endif // USE_DX10
     vBase = 0;
     _Load_hw(*this, _verts_);
 }
 
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
 
 void CSkeletonX_ext::_Load_hw(Fvisual& V, void* _verts_)
 {
@@ -765,7 +765,7 @@ void CSkeletonX_ext::_CollectBoneFaces(Fvisual* V, u32 iBase, u32 iCount)
 {
     u16* indices = nullptr;
 
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
     indices = *m_Indices;
 #else // USE_DX10
     R_CHK(V->p_rm_Indices->Lock(0, V->dwPrimitives * 3, (void**)&indices, D3DLOCK_READONLY));
@@ -1083,7 +1083,7 @@ BOOL CSkeletonX_ext::_PickBone(IKinematics::pick_result& r, float dist, const Fv
     CBoneData::FacesVec* faces = &BD.child_faces[ChildIDX];
     BOOL result = FALSE;
     u16* indices = nullptr;
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
     indices = *m_Indices;
 #else // USE_DX10
     CHK_DX(V->p_rm_Indices->Lock(0, V->dwPrimitives * 3, (void**)&indices, D3DLOCK_READONLY));
@@ -1151,7 +1151,7 @@ void CSkeletonX_PM::EnumBoneVertices(SEnumVerticesCallback& C, u16 bone_id)
     inherited2::_EnumBoneVertices(C, this, bone_id, iBase + SW.offset, SW.num_tris * 3);
 }
 
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
 
 void CSkeletonX_ext::_FillVerticesHW1W(const Fmatrix& view, CSkeletonWallmark& wm, const Fvector& normal, float size,
     Fvisual* V, u16* indices, CBoneData::FacesVec& faces)
@@ -1546,7 +1546,7 @@ void CSkeletonX_ext::_EnumBoneVertices(SEnumVerticesCallback& C, Fvisual* V, u16
     u16* indices = nullptr;
     //R_CHK(V->pIndices->Lock(iBase, iCount, (void**)&indices, D3DLOCK_READONLY));
 
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
     VERIFY(*m_Indices);
     indices = *m_Indices;
 #else // USE_DX10
diff --git a/src/Layers/xrRender/HW.h b/src/Layers/xrRender/HW.h
index 2f983441b41..008af2bba95 100644
--- a/src/Layers/xrRender/HW.h
+++ b/src/Layers/xrRender/HW.h
@@ -101,7 +101,7 @@ class CHW
     stats_manager stats_manager;
 #endif
 
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
     void UpdateViews();
 #endif
 #if defined(USE_DX10) || defined(USE_DX11)
diff --git a/src/Layers/xrRender/R_Backend.h b/src/Layers/xrRender/R_Backend.h
index a07f0e31e7d..321405e8539 100644
--- a/src/Layers/xrRender/R_Backend.h
+++ b/src/Layers/xrRender/R_Backend.h
@@ -110,7 +110,7 @@ class ECORE_API CBackend
 #endif // USE_OGL
 
     // Vertices/Indices/etc
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
     SDeclaration* decl;
 #else	//	USE_DX10
     IDirect3DVertexDeclaration9* decl;
@@ -151,7 +151,7 @@ class ECORE_API CBackend
 #ifdef DEBUG
     LPCSTR ps_name;
     LPCSTR vs_name;
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
     LPCSTR gs_name;
 #ifdef USE_DX11
     LPCSTR hs_name;
@@ -183,7 +183,7 @@ class ECORE_API CBackend
     CTexture* textures_ps[CTexture::mtMaxPixelShaderTextures]; // stages
     //CTexture* textures_vs[5]; // dmap + 4 vs
     CTexture* textures_vs[CTexture::mtMaxVertexShaderTextures]; // 4 vs
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
     CTexture* textures_gs[CTexture::mtMaxGeometryShaderTextures]; // 4 vs
 #	ifdef USE_DX11
     CTexture* textures_hs[CTexture::mtMaxHullShaderTextures]; // 4 vs
@@ -303,7 +303,7 @@ class ECORE_API CBackend
     ICF void set_States(SState* _state);
     ICF void set_States(ref_state& _state) { set_States(&*_state); }
 
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
     ICF void set_Format(SDeclaration* _decl);
 #else // USE_DX10
     ICF void set_Format(IDirect3DVertexDeclaration9* _decl);
@@ -316,7 +316,7 @@ class ECORE_API CBackend
 #endif // USE_OGL
     ICF void set_PS(ref_ps& _ps) { set_PS(_ps->sh, _ps->cName.c_str()); }
 
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
 #ifdef USE_OGL
     ICF void set_GS(GLuint _gs, LPCSTR _n = 0);
 #else
@@ -431,7 +431,7 @@ class ECORE_API CBackend
             constants.seta(C, e, x, y, z, w);
     }
 
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
     ICF void set_c(R_constant* C, float A)
     {
         if (C)
@@ -483,7 +483,7 @@ class ECORE_API CBackend
             set_ca(&*ctable->get(n), e, x, y, z, w);
     }
 
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
     ICF void set_c(LPCSTR n, float A)
     {
         if (ctable)
@@ -534,7 +534,7 @@ class ECORE_API CBackend
             set_ca(&*ctable->get(n), e, x, y, z, w);
     }
 
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
     ICF void set_c(shared_str& n, float A)
     {
         if (ctable)
@@ -566,7 +566,7 @@ class ECORE_API CBackend
     // Debug render
     void dbg_DP(D3DPRIMITIVETYPE pt, ref_geom geom, u32 vBase, u32 pc);
     void dbg_DIP(D3DPRIMITIVETYPE pt, ref_geom geom, u32 baseV, u32 startV, u32 countV, u32 startI, u32 PC);
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
     //	TODO: DX10: Implement this.
     IC void dbg_SetRS(D3DRENDERSTATETYPE p1, u32 p2) { VERIFY(!"Not implemented"); }
     IC void dbg_SetSS(u32 sampler, D3DSAMPLERSTATETYPE type, u32 value) { VERIFY(!"Not implemented"); }
diff --git a/src/Layers/xrRender/R_Backend_DBG.cpp b/src/Layers/xrRender/R_Backend_DBG.cpp
index 46bbdec13e5..6e4b2b9e4f6 100644
--- a/src/Layers/xrRender/R_Backend_DBG.cpp
+++ b/src/Layers/xrRender/R_Backend_DBG.cpp
@@ -17,7 +17,7 @@ void CBackend::dbg_DIP(D3DPRIMITIVETYPE pt, ref_geom geom, u32 baseV, u32 startV
 
 void CBackend::dbg_Draw(D3DPRIMITIVETYPE T, FVF::L* pVerts, int vcnt, u16* pIdx, int pcnt)
 {
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
 //	TODO: DX10: implement
 // VERIFY(!"CBackend::dbg_Draw not implemented.");
     UNUSED(T);
@@ -33,7 +33,7 @@ void CBackend::dbg_Draw(D3DPRIMITIVETYPE T, FVF::L* pVerts, int vcnt, u16* pIdx,
 }
 void CBackend::dbg_Draw(D3DPRIMITIVETYPE T, FVF::L* pVerts, int pcnt)
 {
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
 //	TODO: DX10: implement
 // VERIFY(!"CBackend::dbg_Draw not implemented.");
     UNUSED(T);
@@ -162,7 +162,7 @@ void CBackend::dbg_DrawEllipse(Fmatrix& T, u32 C)
 
     set_xform_world(T);
 
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
 //	TODO: DX10: implement
 // VERIFY(!"CBackend::dbg_Draw not implemented.");
 // dbg_Draw(D3DPT_TRIANGLELIST,verts,vcnt,gFaces,224);
diff --git a/src/Layers/xrRender/R_Backend_Runtime.cpp b/src/Layers/xrRender/R_Backend_Runtime.cpp
index 02bb903dcb6..e09526caa0e 100644
--- a/src/Layers/xrRender/R_Backend_Runtime.cpp
+++ b/src/Layers/xrRender/R_Backend_Runtime.cpp
@@ -149,7 +149,7 @@ void CBackend::Invalidate()
 void CBackend::set_ClipPlanes(u32 _enable, Fplane* _planes /*=NULL */, u32 count /* =0*/)
 {
 
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
     // TODO: DX10: Implement in the corresponding vertex shaders
     // Use this to set up location, were shader setup code will get data
     // VERIFY(!"CBackend::set_ClipPlanes not implemented!");
@@ -196,7 +196,7 @@ void CBackend::set_ClipPlanes(u32 _enable, Fmatrix* _xform /*=NULL */, u32 fmask
         return;
     if (!_enable)
     {
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
 // TODO: DX10: Implement in the corresponding vertex shaders
 // Use this to set up location, were shader setup code will get data
 // VERIFY(!"CBackend::set_ClipPlanes not implemented!");
diff --git a/src/Layers/xrRender/ResourceManager.h b/src/Layers/xrRender/ResourceManager.h
index 5c80632ad24..5d25d6662f1 100644
--- a/src/Layers/xrRender/ResourceManager.h
+++ b/src/Layers/xrRender/ResourceManager.h
@@ -38,7 +38,7 @@ class ECORE_API CResourceManager
     //	DX10 cut DEFINE_MAP_PRED(const char*,CRTC*,			map_RTC,		map_RTCIt,			str_pred);
     using map_VS = xr_map<const char*, SVS*, str_pred>;
 
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
     using map_GS = xr_map<const char*, SGS*, str_pred>;
 #endif
 
@@ -62,7 +62,7 @@ class ECORE_API CResourceManager
     map_VS m_vs;
     map_PS m_ps;
 
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
     map_GS m_gs;
 #endif
 
@@ -159,7 +159,7 @@ class ECORE_API CResourceManager
 
 //	DX10 cut CRTC*							_CreateRTC			(LPCSTR Name, u32 size,	D3DFORMAT f);
 //	DX10 cut void							_DeleteRTC			(const CRTC*	RT	);
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
     SGS* _CreateGS(LPCSTR Name);
     void _DeleteGS(const SGS* GS);
 #endif //	USE_DX10
diff --git a/src/Layers/xrRender/SH_Atomic.cpp b/src/Layers/xrRender/SH_Atomic.cpp
index 937efa3b6ec..643fd9a5f89 100644
--- a/src/Layers/xrRender/SH_Atomic.cpp
+++ b/src/Layers/xrRender/SH_Atomic.cpp
@@ -63,7 +63,7 @@ SPS::~SPS()
     RImplementation.Resources->_DeletePS(this);
 }
 
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
 ///////////////////////////////////////////////////////////////////////
 // SGS
 SGS::~SGS()
diff --git a/src/Layers/xrRender/SH_Atomic.h b/src/Layers/xrRender/SH_Atomic.h
index f5b869d055f..fad9f19a49f 100644
--- a/src/Layers/xrRender/SH_Atomic.h
+++ b/src/Layers/xrRender/SH_Atomic.h
@@ -53,7 +53,7 @@ struct ECORE_API SPS : public xr_resource_named
 };
 typedef resptr_core<SPS, resptr_base<SPS>> ref_ps;
 
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
 //////////////////////////////////////////////////////////////////////////
 struct ECORE_API SGS : public xr_resource_named
 {
diff --git a/src/Layers/xrRender/SH_Texture.h b/src/Layers/xrRender/SH_Texture.h
index 953125b5d9c..d8c89bab741 100644
--- a/src/Layers/xrRender/SH_Texture.h
+++ b/src/Layers/xrRender/SH_Texture.h
@@ -10,7 +10,7 @@ class CTheoraSurface;
 class ECORE_API CTexture : public xr_resource_named
 {
 public:
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
     enum	MaxTextures
     {
         //	Actually these values are 128
diff --git a/src/Layers/xrRender/Shader.cpp b/src/Layers/xrRender/Shader.cpp
index 4c4a266d35b..d111f04cc17 100644
--- a/src/Layers/xrRender/Shader.cpp
+++ b/src/Layers/xrRender/Shader.cpp
@@ -54,7 +54,7 @@ BOOL SPass::equal(const SPass& other)
         return FALSE;
     if (vs != other.vs)
         return FALSE;
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
     if (gs != other.gs)
         return FALSE;
 #ifdef USE_DX11
diff --git a/src/Layers/xrRender/Shader.h b/src/Layers/xrRender/Shader.h
index 143414715ed..8fc9e6ded5d 100644
--- a/src/Layers/xrRender/Shader.h
+++ b/src/Layers/xrRender/Shader.h
@@ -97,7 +97,7 @@ struct ECORE_API SPass : public xr_resource_flagged
     ref_state state; // Generic state, like Z-Buffering, samplers, etc
     ref_ps ps; // may be NULL = FFP, in that case "state" must contain TSS setup
     ref_vs vs; // may be NULL = FFP, in that case "state" must contain RS setup, *and* FVF-compatible declaration must be used
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
     ref_gs gs; // may be NULL = don't use geometry shader at all
 #ifdef USE_DX11
     ref_hs hs; // may be NULL = don't use hull shader at all
diff --git a/src/Layers/xrRender/ShaderResourceTraits.h b/src/Layers/xrRender/ShaderResourceTraits.h
index 1b0ea25eaf6..44ddee6ef35 100644
--- a/src/Layers/xrRender/ShaderResourceTraits.h
+++ b/src/Layers/xrRender/ShaderResourceTraits.h
@@ -128,7 +128,7 @@ struct ShaderTypeTraits<SPS>
     static inline u32 GetShaderDest() { return RC_dest_pixel; }
 };
 
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
 template <>
 struct ShaderTypeTraits<SGS>
 {
@@ -309,7 +309,7 @@ inline CResourceManager::map_VS& CResourceManager::GetShaderMap()
     return m_vs;
 }
 
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
 template <>
 inline CResourceManager::map_GS& CResourceManager::GetShaderMap()
 {
diff --git a/src/Layers/xrRender/SkeletonX.cpp b/src/Layers/xrRender/SkeletonX.cpp
index 3c2b4fa9470..c11a71caed5 100644
--- a/src/Layers/xrRender/SkeletonX.cpp
+++ b/src/Layers/xrRender/SkeletonX.cpp
@@ -52,7 +52,7 @@ void CSkeletonX::_Copy(CSkeletonX* B)
     RMS_boneid = B->RMS_boneid;
     RMS_bonecount = B->RMS_bonecount;
 
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
     m_Indices = B->m_Indices;
 #endif //	USE_DX10
 }
@@ -680,7 +680,7 @@ void CSkeletonX::_FillVerticesSoft4W(const Fmatrix& view, CSkeletonWallmark& wm,
     }
 }
 
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
 void CSkeletonX::_DuplicateIndices(const char* /*N*/, IReader* data)
 {
     //	We will have trouble with container since don't know were to take readable indices
diff --git a/src/Layers/xrRender/SkeletonX.h b/src/Layers/xrRender/SkeletonX.h
index fbad6c3e45b..889788e0248 100644
--- a/src/Layers/xrRender/SkeletonX.h
+++ b/src/Layers/xrRender/SkeletonX.h
@@ -125,7 +125,7 @@ class CSkeletonX
     virtual void FillVertices(
         const Fmatrix& view, CSkeletonWallmark& wm, const Fvector& normal, float size, u16 bone_id) = 0;
 
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
 protected:
     void _DuplicateIndices(const char* N, IReader* data);
 
@@ -157,7 +157,7 @@ BOOL pick_bone(T_buffer vertices, CKinematics* Parent, IKinematics::pick_result&
     return FALSE;
 }
 
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
 template <typename T>
 BOOL pick_bone(CKinematics* Parent, IKinematics::pick_result& r, float dist, const Fvector& S, const Fvector& D,
     Fvisual* V, u16* indices, CBoneData::FacesVec& faces)
diff --git a/src/Layers/xrRender/blenders/Blender_Recorder.cpp b/src/Layers/xrRender/blenders/Blender_Recorder.cpp
index 23bd696a26a..66131e6f907 100644
--- a/src/Layers/xrRender/blenders/Blender_Recorder.cpp
+++ b/src/Layers/xrRender/blenders/Blender_Recorder.cpp
@@ -178,7 +178,7 @@ void CBlender_Compile::PassEnd()
     proto.vs = RImplementation.Resources->_CreateVS(pass_vs);
     ctable.merge(&proto.ps->constants);
     ctable.merge(&proto.vs->constants);
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
     proto.gs = RImplementation.Resources->_CreateGS(pass_gs);
     ctable.merge(&proto.gs->constants);
 #ifdef USE_DX11
diff --git a/src/Layers/xrRender/blenders/Blender_Recorder.h b/src/Layers/xrRender/blenders/Blender_Recorder.h
index 711d6171ced..a57b779d62a 100644
--- a/src/Layers/xrRender/blenders/Blender_Recorder.h
+++ b/src/Layers/xrRender/blenders/Blender_Recorder.h
@@ -53,9 +53,9 @@ class CBlender_Compile
 
     string128 pass_vs;
     string128 pass_ps;
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
     string128 pass_gs;
-#ifdef USE_DX11
+#if defined(USE_DX11) || defined(USE_DX12)
     string128 pass_hs;
     string128 pass_ds;
     string128 pass_cs;
@@ -134,7 +134,7 @@ class CBlender_Compile
     void r_Pass(LPCSTR vs, LPCSTR ps, bool bFog, BOOL bZtest = TRUE, BOOL bZwrite = TRUE, BOOL bABlend = FALSE,
         D3DBLEND abSRC = D3DBLEND_ONE, D3DBLEND abDST = D3DBLEND_ZERO, BOOL aTest = FALSE, u32 aRef = 0);
     void r_Constant(LPCSTR name, R_constant_setup* s);
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
     void r_Pass(LPCSTR vs, LPCSTR gs, LPCSTR ps, bool bFog, BOOL bZtest = TRUE, BOOL bZwrite = TRUE,
         BOOL bABlend = FALSE, D3DBLEND abSRC = D3DBLEND_ONE, D3DBLEND abDST = D3DBLEND_ZERO, BOOL aTest = FALSE,
         u32 aRef = 0);
diff --git a/src/Layers/xrRender/dxConsoleRender.cpp b/src/Layers/xrRender/dxConsoleRender.cpp
index d39562cd3ce..b11c967d039 100644
--- a/src/Layers/xrRender/dxConsoleRender.cpp
+++ b/src/Layers/xrRender/dxConsoleRender.cpp
@@ -18,7 +18,7 @@ void dxConsoleRender::OnRender(bool bGame)
     if (bGame)
         R.y2 /= 2;
 
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
     u32 vOffset = 0;
     //	TODO: DX10: Implement console background clearing for DX10
     FVF::TL* verts = (FVF::TL*)RCache.Vertex.Lock(4, m_Geom->vb_stride, vOffset);
diff --git a/src/Layers/xrRender/dxConsoleRender.h b/src/Layers/xrRender/dxConsoleRender.h
index 40f114500a7..a187e80ec77 100644
--- a/src/Layers/xrRender/dxConsoleRender.h
+++ b/src/Layers/xrRender/dxConsoleRender.h
@@ -13,7 +13,7 @@ class dxConsoleRender : public IConsoleRender
     virtual void OnRender(bool bGame);
 
 private:
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
     ref_shader m_Shader;
     ref_geom m_Geom;
 #endif
diff --git a/src/Layers/xrRender/dxDebugRender.cpp b/src/Layers/xrRender/dxDebugRender.cpp
index d6d6dc42f31..9a94bcdfe84 100644
--- a/src/Layers/xrRender/dxDebugRender.cpp
+++ b/src/Layers/xrRender/dxDebugRender.cpp
@@ -91,7 +91,7 @@ void dxDebugRender::CacheSetXformWorld(const Fmatrix& M) { RCache.set_xform_worl
 void dxDebugRender::CacheSetCullMode(CullMode m) { RCache.set_CullMode(CULL_NONE + m); }
 void dxDebugRender::SetAmbient(u32 colour)
 {
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
     //	TODO: DX10: Check if need this for DX10
     VERIFY(!"Not implemented for DX10");
     UNUSED(colour);
diff --git a/src/Layers/xrRender/dxEnvironmentRender.cpp b/src/Layers/xrRender/dxEnvironmentRender.cpp
index 5c8ceb01386..1c60ae15243 100644
--- a/src/Layers/xrRender/dxEnvironmentRender.cpp
+++ b/src/Layers/xrRender/dxEnvironmentRender.cpp
@@ -174,7 +174,7 @@ void dxEnvironmentRender::OnFrame(CEnvironment& env)
 #endif // USE_OGL
 
 // ******************** Environment params (setting)
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
 //	TODO: DX10: Implement environment parameters setting for DX10 (if necessary)
 #else //	USE_DX10
 
diff --git a/src/Layers/xrRender/r__dsgraph_build.cpp b/src/Layers/xrRender/r__dsgraph_build.cpp
index 69f9cc5cc24..d136d55519a 100644
--- a/src/Layers/xrRender/r__dsgraph_build.cpp
+++ b/src/Layers/xrRender/r__dsgraph_build.cpp
@@ -169,7 +169,7 @@ void D3DXRenderBase::r_dsgraph_insert_dynamic(dxRender_Visual* pVisual, Fvector&
                     {
                         Nps.ssa = SSA;
 #endif
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
                         if (SSA > Ngs.ssa)
                         {
                             Ngs.ssa = SSA;
@@ -178,7 +178,7 @@ void D3DXRenderBase::r_dsgraph_insert_dynamic(dxRender_Visual* pVisual, Fvector&
                             {
                                 Nvs.ssa = SSA;
                             }
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
                         }
 #endif
                     }
@@ -316,7 +316,7 @@ void D3DXRenderBase::r_dsgraph_insert_static(dxRender_Visual* pVisual)
                     {
                         Nps.ssa = SSA;
 #endif
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
                         if (SSA > Ngs.ssa)
                         {
                             Ngs.ssa = SSA;
@@ -325,7 +325,7 @@ void D3DXRenderBase::r_dsgraph_insert_static(dxRender_Visual* pVisual)
                             {
                                 Nvs.ssa = SSA;
                             }
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
                         }
 #endif
                     }
@@ -928,7 +928,7 @@ void D3DXRenderBase::SetupGPU(bool bForceGPU_SW, bool bForceGPU_NonPure, bool bF
 
 void D3DXRenderBase::overdrawBegin()
 {
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
     //  TODO: DX10: Implement overdrawBegin
     VERIFY(!"D3DXRenderBase::overdrawBegin not implemented.");
 #else
@@ -950,7 +950,7 @@ void D3DXRenderBase::overdrawBegin()
 
 void D3DXRenderBase::overdrawEnd()
 {
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
     // TODO: DX10: Implement overdrawEnd
     VERIFY(!"D3DXRenderBase::overdrawEnd not implemented.");
 #else
@@ -1039,7 +1039,7 @@ void D3DXRenderBase::Begin()
 
 void D3DXRenderBase::Clear()
 {
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
     HW.pContext->ClearDepthStencilView(RCache.get_ZB(), D3D_CLEAR_DEPTH | D3D_CLEAR_STENCIL, 1.0f, 0);
     if (psDeviceFlags.test(rsClearBB))
     {
diff --git a/src/Layers/xrRender/r__dsgraph_render.cpp b/src/Layers/xrRender/r__dsgraph_render.cpp
index 0655292de52..2f0baba0963 100644
--- a/src/Layers/xrRender/r__dsgraph_render.cpp
+++ b/src/Layers/xrRender/r__dsgraph_render.cpp
@@ -116,7 +116,7 @@ void D3DXRenderBase::r_dsgraph_render_graph(u32 _priority)
             {
                 RCache.set_VS(vs_it->first);
 
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
                 //	GS setup
                 mapNormalGS& gs = vs_it->second;
                 gs.ssa = 0;
@@ -205,7 +205,7 @@ void D3DXRenderBase::r_dsgraph_render_graph(u32 _priority)
                     }
                     nrmPS.clear();
                     ps.clear();
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
                 }
                 nrmGS.clear();
                 gs.clear();
@@ -231,7 +231,7 @@ void D3DXRenderBase::r_dsgraph_render_graph(u32 _priority)
         {
             RCache.set_VS(vs_id->first);
 
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
             mapMatrixGS& gs = vs_id->second;
             gs.ssa = 0;
 
@@ -323,7 +323,7 @@ void D3DXRenderBase::r_dsgraph_render_graph(u32 _priority)
                 }
                 matPS.clear();
                 ps.clear();
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
             }
             matGS.clear();
             gs.clear();
diff --git a/src/Layers/xrRender/r__dsgraph_types.h b/src/Layers/xrRender/r__dsgraph_types.h
index ec93d1fbf1e..45c97062a78 100644
--- a/src/Layers/xrRender/r__dsgraph_types.h
+++ b/src/Layers/xrRender/r__dsgraph_types.h
@@ -99,7 +99,7 @@ struct mapNormalPS : public xr_unordered_map<ps_type, mapNormalCS>
 };
 #endif
 
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
 struct mapNormalGS : public xr_unordered_map<gs_type, mapNormalPS>
 {
     float ssa;
@@ -155,7 +155,7 @@ struct mapMatrixPS : public xr_unordered_map<ps_type, mapMatrixCS>
 };
 #endif
 
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
 struct mapMatrixGS : public xr_unordered_map<gs_type, mapMatrixPS>
 {
     float ssa;
diff --git a/src/Layers/xrRender/r_constants.cpp b/src/Layers/xrRender/r_constants.cpp
index 3a2806a5282..5a3a420b52a 100644
--- a/src/Layers/xrRender/r_constants.cpp
+++ b/src/Layers/xrRender/r_constants.cpp
@@ -189,7 +189,7 @@ void R_constant_table::merge(R_constant_table* T)
             C->type = src->type;
             C->ps = src->ps;
             C->vs = src->vs;
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
             C->gs = src->gs;
 #ifdef USE_DX11
             C->hs = src->hs;
diff --git a/src/Layers/xrRender/r_constants.h b/src/Layers/xrRender/r_constants.h
index 8b6d9db25e8..7bddd01be8c 100644
--- a/src/Layers/xrRender/r_constants.h
+++ b/src/Layers/xrRender/r_constants.h
@@ -99,7 +99,7 @@ struct ECORE_API R_constant : public xr_resource
 
     R_constant_load ps;
     R_constant_load vs;
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
     R_constant_load gs;
 #ifdef USE_DX11
     R_constant_load hs;
@@ -119,7 +119,7 @@ struct ECORE_API R_constant : public xr_resource
         {
         case RC_dest_vertex: return vs;
         case RC_dest_pixel: return ps;
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
         case RC_dest_geometry: return gs;
 #ifdef USE_DX11
         case RC_dest_hull: return hs;
diff --git a/src/Layers/xrRender/tss.h b/src/Layers/xrRender/tss.h
index 3a1ebc7b30f..96e4314978b 100644
--- a/src/Layers/xrRender/tss.h
+++ b/src/Layers/xrRender/tss.h
@@ -4,7 +4,7 @@
 
 #include "tss_def.h"
 
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
 enum XRDX10SAMPLERSTATETYPE
 {
     XRDX10SAMP_ANISOTROPICFILTER = 256,
diff --git a/src/Layers/xrRender/xrRender_console.cpp b/src/Layers/xrRender/xrRender_console.cpp
index a502338f33a..123e71b888b 100644
--- a/src/Layers/xrRender/xrRender_console.cpp
+++ b/src/Layers/xrRender/xrRender_console.cpp
@@ -45,14 +45,14 @@ const xr_token qsun_shafts_token[] = {{"st_opt_off", 0}, {"st_opt_low", 1}, {"st
 
 u32 ps_r_ssao = 3;
 const xr_token qssao_token[] = {{"st_opt_off", 0}, {"st_opt_low", 1}, {"st_opt_medium", 2}, {"st_opt_high", 3},
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
     {"st_opt_ultra", 4},
 #endif
     {nullptr, 0}};
 
 u32 ps_r_sun_quality = 1; // = 0;
 const xr_token qsun_quality_token[] = {{"st_opt_low", 0}, {"st_opt_medium", 1}, {"st_opt_high", 2},
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
+#ifndef USE_DX9
     {"st_opt_ultra", 3}, {"st_opt_extreme", 4},
 #endif // USE_DX10
     {nullptr, 0}};