xrRender_RX: replaced BOOL with bool

Replaced IDirect3DIndexBuffer9 and IDirect3DVertexBuffer9 with ID3DVertexBuffer and ID3DIndexBuffer.
OpenXRay · Oct 1, 2018 · 2d234ac · 2d234ac
1 parent 71b5db5
commit 2d234ac
Show file tree

Hide file tree

Showing 16 changed files with 74 additions and 74 deletions.
diff --git a/src/Layers/xrRender/ResourceManager_Resources.cpp b/src/Layers/xrRender/ResourceManager_Resources.cpp
@@ -284,7 +284,7 @@ void CResourceManager::DBG_VerifyGeoms()
     */
 }
 
-SGeometry* CResourceManager::CreateGeom(D3DVERTEXELEMENT9* decl, IDirect3DVertexBuffer9* vb, IDirect3DIndexBuffer9* ib)
+SGeometry* CResourceManager::CreateGeom(D3DVERTEXELEMENT9* decl, ID3DVertexBuffer* vb, ID3DIndexBuffer* ib)
 {
     R_ASSERT(decl && vb);
 
@@ -308,7 +308,7 @@ SGeometry* CResourceManager::CreateGeom(D3DVERTEXELEMENT9* decl, IDirect3DVertex
     v_geoms.push_back(Geom);
     return Geom;
 }
-SGeometry* CResourceManager::CreateGeom(u32 FVF, IDirect3DVertexBuffer9* vb, IDirect3DIndexBuffer9* ib)
+SGeometry* CResourceManager::CreateGeom(u32 FVF, ID3DVertexBuffer* vb, ID3DIndexBuffer* ib)
 {
     D3DVERTEXELEMENT9 dcl[MAX_FVF_DECL_SIZE];
     CHK_DX(D3DXDeclaratorFromFVF(FVF, dcl));

diff --git a/src/Layers/xrRenderDX10/dx10R_Backend_Runtime.h b/src/Layers/xrRenderDX10/dx10R_Backend_Runtime.h
@@ -180,7 +180,7 @@ ICF void CBackend::set_Vertices(ID3DVertexBuffer* _vb, u32 _vb_stride)
         vb_stride = _vb_stride;
         // CHK_DX           (HW.pDevice->SetStreamSource(0,vb,0,vb_stride));
         // UINT StreamNumber,
-        // IDirect3DVertexBuffer9 * pStreamData,
+        // ID3DVertexBuffer * pStreamData,
         // UINT OffsetInBytes,
         // UINT Stride
 

diff --git a/src/Layers/xrRenderPC_GL/gl_loader.cpp b/src/Layers/xrRenderPC_GL/gl_loader.cpp
@@ -60,7 +60,7 @@ void CRender::level_Load(IReader* fs)
         {
             CStreamReader* geom = FS.rs_open("$level$", "level.geom");
             R_ASSERT2 (geom, "level.geom");
-            LoadBuffers(geom,FALSE);
+            LoadBuffers(geom, false);
             LoadSWIs(geom);
             FS.r_close(geom);
         }
@@ -69,7 +69,7 @@ void CRender::level_Load(IReader* fs)
         {
             CStreamReader* geom = FS.rs_open("$level$", "level.geomx");
             R_ASSERT2 (geom, "level.geomX");
-            LoadBuffers(geom,TRUE);
+            LoadBuffers(geom, true);
             FS.r_close(geom);
         }
 
@@ -172,15 +172,15 @@ void CRender::level_Unload()
     b_loaded = FALSE;
 }
 
-void CRender::LoadBuffers(CStreamReader* base_fs, BOOL _alternative)
+void CRender::LoadBuffers(CStreamReader* base_fs, bool alternative)
 {
     R_ASSERT2 (base_fs,"Could not load geometry. File not found.");
     Resources->Evict();
     //	u32	dwUsage					= D3DUSAGE_WRITEONLY;
 
-    xr_vector<VertexDeclarator>& _DC = _alternative ? xDC : nDC;
-    xr_vector<GLuint>& _VB = _alternative ? xVB : nVB;
-    xr_vector<GLuint>& _IB = _alternative ? xIB : nIB;
+    xr_vector<VertexDeclarator>& _DC = alternative ? xDC : nDC;
+    xr_vector<GLuint>& _VB = alternative ? xVB : nVB;
+    xr_vector<GLuint>& _IB = alternative ? xIB : nIB;
 
     // Vertex buffers
     {

diff --git a/src/Layers/xrRenderPC_GL/rgl.h b/src/Layers/xrRenderPC_GL/rgl.h
@@ -188,7 +188,7 @@ class CRender : public D3DXRenderBase
 
 private:
     // Loading / Unloading
-    void LoadBuffers(CStreamReader* fs, BOOL _alternative);
+    void LoadBuffers(CStreamReader* fs, bool alternative);
     void LoadVisuals(IReader* fs);
     void LoadLights(IReader* fs);
     void LoadPortals(IReader* fs);

diff --git a/src/Layers/xrRenderPC_R1/FStaticRender.cpp b/src/Layers/xrRenderPC_R1/FStaticRender.cpp
@@ -255,12 +255,12 @@ D3DVERTEXELEMENT9* CRender::getVB_Format(int id)
     VERIFY(id < int(DCL.size()));
     return DCL[id].begin();
 }
-IDirect3DVertexBuffer9* CRender::getVB(int id)
+ID3DVertexBuffer* CRender::getVB(int id)
 {
     VERIFY(id < int(VB.size()));
     return VB[id];
 }
-IDirect3DIndexBuffer9* CRender::getIB(int id)
+ID3DIndexBuffer* CRender::getIB(int id)
 {
     VERIFY(id < int(IB.size()));
     return IB[id];

diff --git a/src/Layers/xrRenderPC_R1/FStaticRender.h b/src/Layers/xrRenderPC_R1/FStaticRender.h
@@ -51,8 +51,8 @@ class CRender : public D3DXRenderBase
     xr_vector<ref_shader> Shaders;
     typedef svector<D3DVERTEXELEMENT9, MAXD3DDECLLENGTH + 1> VertexDeclarator;
     xr_vector<VertexDeclarator> DCL;
-    xr_vector<IDirect3DVertexBuffer9*> VB;
-    xr_vector<IDirect3DIndexBuffer9*> IB;
+    xr_vector<ID3DVertexBuffer*> VB;
+    xr_vector<ID3DIndexBuffer*> IB;
     xr_vector<dxRender_Visual*> Visuals;
     CPSLibrary PSLibrary;
     CLight_DB Lights;
@@ -92,8 +92,8 @@ class CRender : public D3DXRenderBase
     ShaderElement* rimp_select_sh_static(dxRender_Visual* pVisual, float cdist_sq);
     ShaderElement* rimp_select_sh_dynamic(dxRender_Visual* pVisual, float cdist_sq);
     D3DVERTEXELEMENT9* getVB_Format(int id);
-    IDirect3DVertexBuffer9* getVB(int id);
-    IDirect3DIndexBuffer9* getIB(int id);
+    ID3DVertexBuffer* getVB(int id);
+    ID3DIndexBuffer* getIB(int id);
     FSlideWindowItem* getSWI(int id);
     IRender_Portal* getPortal(int id);
     IRender_Sector* getSectorActive();

diff --git a/src/Layers/xrRenderPC_R2/r2.cpp b/src/Layers/xrRenderPC_R2/r2.cpp
@@ -491,9 +491,9 @@ IRenderVisual* CRender::getVisual(int id)
     VERIFY(id < int(Visuals.size()));
     return Visuals[id];
 }
-D3DVERTEXELEMENT9* CRender::getVB_Format(int id, BOOL _alt)
+D3DVERTEXELEMENT9* CRender::getVB_Format(int id, bool alternative)
 {
-    if (_alt)
+    if (alternative)
     {
         VERIFY(id < int(xDC.size()));
         return xDC[id].begin();
@@ -504,9 +504,9 @@ D3DVERTEXELEMENT9* CRender::getVB_Format(int id, BOOL _alt)
         return nDC[id].begin();
     }
 }
-IDirect3DVertexBuffer9* CRender::getVB(int id, BOOL _alt)
+ID3DVertexBuffer* CRender::getVB(int id, bool alternative)
 {
-    if (_alt)
+    if (alternative)
     {
         VERIFY(id < int(xVB.size()));
         return xVB[id];
@@ -517,9 +517,9 @@ IDirect3DVertexBuffer9* CRender::getVB(int id, BOOL _alt)
         return nVB[id];
     }
 }
-IDirect3DIndexBuffer9* CRender::getIB(int id, BOOL _alt)
+ID3DIndexBuffer* CRender::getIB(int id, bool alternative)
 {
-    if (_alt)
+    if (alternative)
     {
         VERIFY(id < int(xIB.size()));
         return xIB[id];

diff --git a/src/Layers/xrRenderPC_R2/r2.h b/src/Layers/xrRenderPC_R2/r2.h
@@ -118,8 +118,8 @@ class CRender : public D3DXRenderBase
     xr_vector<ref_shader> Shaders;
     typedef svector<D3DVERTEXELEMENT9, MAXD3DDECLLENGTH + 1> VertexDeclarator;
     xr_vector<VertexDeclarator> nDC, xDC;
-    xr_vector<IDirect3DVertexBuffer9 *> nVB, xVB;
-    xr_vector<IDirect3DIndexBuffer9 *> nIB, xIB;
+    xr_vector<ID3DVertexBuffer*> nVB, xVB;
+    xr_vector<ID3DIndexBuffer*> nIB, xIB;
     xr_vector<dxRender_Visual*> Visuals;
     CPSLibrary PSLibrary;
 
@@ -153,7 +153,7 @@ class CRender : public D3DXRenderBase
 
 private:
     // Loading / Unloading
-    void LoadBuffers(CStreamReader* fs, BOOL _alternative);
+    void LoadBuffers(CStreamReader* fs, bool alternative);
     void LoadVisuals(IReader* fs);
     void LoadLights(IReader* fs);
     void LoadPortals(IReader* fs);
@@ -183,9 +183,9 @@ class CRender : public D3DXRenderBase
 public:
     ShaderElement* rimp_select_sh_static(dxRender_Visual* pVisual, float cdist_sq);
     ShaderElement* rimp_select_sh_dynamic(dxRender_Visual* pVisual, float cdist_sq);
-    D3DVERTEXELEMENT9* getVB_Format(int id, BOOL _alt = FALSE);
-    IDirect3DVertexBuffer9* getVB(int id, BOOL _alt = FALSE);
-    IDirect3DIndexBuffer9* getIB(int id, BOOL _alt = FALSE);
+    D3DVERTEXELEMENT9* getVB_Format(int id, bool alternative = false);
+    ID3DVertexBuffer* getVB(int id, bool alternative = false);
+    ID3DIndexBuffer* getIB(int id, bool alternative = false);
     FSlideWindowItem* getSWI(int id);
     IRender_Portal* getPortal(int id);
     IRender_Sector* getSectorActive();

diff --git a/src/Layers/xrRenderPC_R2/r2_loader.cpp b/src/Layers/xrRenderPC_R2/r2_loader.cpp
@@ -59,7 +59,7 @@ void CRender::level_Load(IReader* fs)
         {
             CStreamReader* geom = FS.rs_open("$level$", "level.geom");
             R_ASSERT2(geom, "level.geom");
-            LoadBuffers(geom, FALSE);
+            LoadBuffers(geom, false);
             LoadSWIs(geom);
             FS.r_close(geom);
         }
@@ -68,7 +68,7 @@ void CRender::level_Load(IReader* fs)
         {
             CStreamReader* geom = FS.rs_open("$level$", "level.geomx");
             R_ASSERT2(geom, "level.geomX");
-            LoadBuffers(geom, TRUE);
+            LoadBuffers(geom, true);
             FS.r_close(geom);
         }
 
@@ -203,15 +203,15 @@ void CRender::level_Unload()
     */
 }
 
-void CRender::LoadBuffers(CStreamReader* base_fs, BOOL _alternative)
+void CRender::LoadBuffers(CStreamReader* base_fs, bool alternative)
 {
     R_ASSERT2(base_fs, "Could not load geometry. File not found.");
     Resources->Evict();
     u32 dwUsage = D3DUSAGE_WRITEONLY;
 
-    xr_vector<VertexDeclarator>& _DC = _alternative ? xDC : nDC;
-    xr_vector<IDirect3DVertexBuffer9*>& _VB = _alternative ? xVB : nVB;
-    xr_vector<IDirect3DIndexBuffer9*>& _IB = _alternative ? xIB : nIB;
+    xr_vector<VertexDeclarator>& _DC  = alternative ? xDC : nDC;
+    xr_vector<ID3DVertexBuffer*>& _VB = alternative ? xVB : nVB;
+    xr_vector<ID3DIndexBuffer*>& _IB  = alternative ? xIB : nIB;
 
     // Vertex buffers
     {

diff --git a/src/Layers/xrRenderPC_R2/r2_rendertarget.h b/src/Layers/xrRenderPC_R2/r2_rendertarget.h
@@ -108,17 +108,17 @@ class CRenderTarget : public IRender_Target
     ref_geom g_accum_omnipart;
     ref_geom g_accum_volumetric;
 
-    IDirect3DVertexBuffer9* g_accum_point_vb;
-    IDirect3DIndexBuffer9* g_accum_point_ib;
+    ID3DVertexBuffer* g_accum_point_vb;
+    ID3DIndexBuffer* g_accum_point_ib;
 
-    IDirect3DVertexBuffer9* g_accum_omnip_vb;
-    IDirect3DIndexBuffer9* g_accum_omnip_ib;
+    ID3DVertexBuffer* g_accum_omnip_vb;
+    ID3DIndexBuffer* g_accum_omnip_ib;
 
-    IDirect3DVertexBuffer9* g_accum_spot_vb;
-    IDirect3DIndexBuffer9* g_accum_spot_ib;
+    ID3DVertexBuffer* g_accum_spot_vb;
+    ID3DIndexBuffer* g_accum_spot_ib;
 
-    IDirect3DVertexBuffer9* g_accum_volumetric_vb;
-    IDirect3DIndexBuffer9* g_accum_volumetric_ib;
+    ID3DVertexBuffer* g_accum_volumetric_vb;
+    ID3DIndexBuffer* g_accum_volumetric_ib;
 
     // SSAO
     ref_shader s_ssao;

diff --git a/src/Layers/xrRenderPC_R3/r3.cpp b/src/Layers/xrRenderPC_R3/r3.cpp
@@ -616,9 +616,9 @@ IRenderVisual* CRender::getVisual(int id)
     VERIFY(id < int(Visuals.size()));
     return Visuals[id];
 }
-D3DVERTEXELEMENT9* CRender::getVB_Format(int id, BOOL _alt)
+D3DVERTEXELEMENT9* CRender::getVB_Format(int id, bool alternative)
 {
-    if (_alt)
+    if (alternative)
     {
         VERIFY(id < int(xDC.size()));
         return xDC[id].begin();
@@ -629,9 +629,9 @@ D3DVERTEXELEMENT9* CRender::getVB_Format(int id, BOOL _alt)
         return nDC[id].begin();
     }
 }
-ID3DVertexBuffer* CRender::getVB(int id, BOOL _alt)
+ID3DVertexBuffer* CRender::getVB(int id, bool alternative)
 {
-    if (_alt)
+    if (alternative)
     {
         VERIFY(id < int(xVB.size()));
         return xVB[id];
@@ -642,9 +642,9 @@ ID3DVertexBuffer* CRender::getVB(int id, BOOL _alt)
         return nVB[id];
     }
 }
-ID3DIndexBuffer* CRender::getIB(int id, BOOL _alt)
+ID3DIndexBuffer* CRender::getIB(int id, bool alternative)
 {
-    if (_alt)
+    if (alternative)
     {
         VERIFY(id < int(xIB.size()));
         return xIB[id];

diff --git a/src/Layers/xrRenderPC_R3/r3.h b/src/Layers/xrRenderPC_R3/r3.h
@@ -185,7 +185,7 @@ class CRender : public D3DXRenderBase
 
 private:
     // Loading / Unloading
-    void LoadBuffers(CStreamReader* fs, BOOL _alternative);
+    void LoadBuffers(CStreamReader* fs, bool alternative);
     void LoadVisuals(IReader* fs);
     void LoadLights(IReader* fs);
     void LoadPortals(IReader* fs);
@@ -217,9 +217,9 @@ class CRender : public D3DXRenderBase
 
     ShaderElement* rimp_select_sh_static(dxRender_Visual* pVisual, float cdist_sq);
     ShaderElement* rimp_select_sh_dynamic(dxRender_Visual* pVisual, float cdist_sq);
-    D3DVERTEXELEMENT9* getVB_Format(int id, BOOL _alt = FALSE);
-    ID3DVertexBuffer* getVB(int id, BOOL _alt = FALSE);
-    ID3DIndexBuffer* getIB(int id, BOOL _alt = FALSE);
+    D3DVERTEXELEMENT9* getVB_Format(int id, bool alternative = false);
+    ID3DVertexBuffer* getVB(int id, bool alternative = false);
+    ID3DIndexBuffer* getIB(int id, bool alternative = false);
     FSlideWindowItem* getSWI(int id);
     IRender_Portal* getPortal(int id);
     IRender_Sector* getSectorActive();

diff --git a/src/Layers/xrRenderPC_R3/r3_loader.cpp b/src/Layers/xrRenderPC_R3/r3_loader.cpp
@@ -62,7 +62,7 @@ void CRender::level_Load(IReader* fs)
         {
             CStreamReader* geom = FS.rs_open("$level$", "level.geom");
             R_ASSERT2(geom, "level.geom");
-            LoadBuffers(geom, FALSE);
+            LoadBuffers(geom, false);
             LoadSWIs(geom);
             FS.r_close(geom);
         }
@@ -71,7 +71,7 @@ void CRender::level_Load(IReader* fs)
         {
             CStreamReader* geom = FS.rs_open("$level$", "level.geomx");
             R_ASSERT2(geom, "level.geomX");
-            LoadBuffers(geom, TRUE);
+            LoadBuffers(geom, true);
             FS.r_close(geom);
         }
 
@@ -207,15 +207,15 @@ void CRender::level_Unload()
     b_loaded = FALSE;
 }
 
-void CRender::LoadBuffers(CStreamReader* base_fs, BOOL _alternative)
+void CRender::LoadBuffers(CStreamReader* base_fs, bool alternative)
 {
     R_ASSERT2(base_fs, "Could not load geometry. File not found.");
     Resources->Evict();
     //	u32	dwUsage					= D3DUSAGE_WRITEONLY;
 
-    xr_vector<VertexDeclarator>& _DC = _alternative ? xDC : nDC;
-    xr_vector<ID3DVertexBuffer*>& _VB = _alternative ? xVB : nVB;
-    xr_vector<ID3DIndexBuffer*>& _IB = _alternative ? xIB : nIB;
+    xr_vector<VertexDeclarator>& _DC  = alternative ? xDC : nDC;
+    xr_vector<ID3DVertexBuffer*>& _VB = alternative ? xVB : nVB;
+    xr_vector<ID3DIndexBuffer*>& _IB  = alternative ? xIB : nIB;
 
     // Vertex buffers
     {

diff --git a/src/Layers/xrRenderPC_R4/r4.cpp b/src/Layers/xrRenderPC_R4/r4.cpp
@@ -627,9 +627,9 @@ IRenderVisual* CRender::getVisual(int id)
     VERIFY(id < int(Visuals.size()));
     return Visuals[id];
 }
-D3DVERTEXELEMENT9* CRender::getVB_Format(int id, BOOL _alt)
+D3DVERTEXELEMENT9* CRender::getVB_Format(int id, bool alternative)
 {
-    if (_alt)
+    if (alternative)
     {
         VERIFY(id < int(xDC.size()));
         return xDC[id].begin();
@@ -640,9 +640,9 @@ D3DVERTEXELEMENT9* CRender::getVB_Format(int id, BOOL _alt)
         return nDC[id].begin();
     }
 }
-ID3DVertexBuffer* CRender::getVB(int id, BOOL _alt)
+ID3DVertexBuffer* CRender::getVB(int id, bool alternative)
 {
-    if (_alt)
+    if (alternative)
     {
         VERIFY(id < int(xVB.size()));
         return xVB[id];
@@ -653,9 +653,9 @@ ID3DVertexBuffer* CRender::getVB(int id, BOOL _alt)
         return nVB[id];
     }
 }
-ID3DIndexBuffer* CRender::getIB(int id, BOOL _alt)
+ID3DIndexBuffer* CRender::getIB(int id, bool alternative)
 {
-    if (_alt)
+    if (alternative)
     {
         VERIFY(id < int(xIB.size()));
         return xIB[id];

diff --git a/src/Layers/xrRenderPC_R4/r4.h b/src/Layers/xrRenderPC_R4/r4.h
@@ -193,7 +193,7 @@ class CRender : public D3DXRenderBase
 
 private:
     // Loading / Unloading
-    void LoadBuffers(CStreamReader* fs, BOOL _alternative);
+    void LoadBuffers(CStreamReader* fs, bool alternative);
     void LoadVisuals(IReader* fs);
     void LoadLights(IReader* fs);
     void LoadPortals(IReader* fs);
@@ -226,9 +226,9 @@ class CRender : public D3DXRenderBase
 public:
     ShaderElement* rimp_select_sh_static(dxRender_Visual* pVisual, float cdist_sq);
     ShaderElement* rimp_select_sh_dynamic(dxRender_Visual* pVisual, float cdist_sq);
-    D3DVERTEXELEMENT9* getVB_Format(int id, BOOL _alt = FALSE);
-    ID3DVertexBuffer* getVB(int id, BOOL _alt = FALSE);
-    ID3DIndexBuffer* getIB(int id, BOOL _alt = FALSE);
+    D3DVERTEXELEMENT9* getVB_Format(int id, bool alternative = false);
+    ID3DVertexBuffer* getVB(int id, bool alternative = false);
+    ID3DIndexBuffer* getIB(int id, bool alternative = false);
     FSlideWindowItem* getSWI(int id);
     IRender_Portal* getPortal(int id);
     IRender_Sector* getSectorActive();