Just some formatting for r4.h and rgl.h

OpenXRay · May 29, 2018 · 3e4cf54 · 3e4cf54
1 parent b7f5c3c
commit 3e4cf54
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/src/Layers/xrRenderPC_GL/rgl.h b/src/Layers/xrRenderPC_GL/rgl.h
@@ -106,7 +106,7 @@ class CRender : public D3DXRenderBase
         float forcegloss_v;
     } o;
 
-    struct RenderR3Statistics
+    struct RenderR4Statistics
     {
         u32 l_total;
         u32 l_visible;
@@ -115,13 +115,10 @@ class CRender : public D3DXRenderBase
         s32 s_used;
         s32 s_merged;
         s32 s_finalclip;
-        u32 o_queries;
-        u32 o_culled;
         u32 ic_total;
         u32 ic_culled;
 
-        RenderR3Statistics() { FrameStart(); }
-
+        RenderR4Statistics() { FrameStart(); }
         void FrameStart()
         {
             l_total = 0;
@@ -131,8 +128,6 @@ class CRender : public D3DXRenderBase
             s_used = 0;
             s_merged = 0;
             s_finalclip = 0;
-            o_queries = 0;
-            o_culled = 0;
             ic_total = 0;
             ic_culled = 0;
         }
@@ -141,7 +136,7 @@ class CRender : public D3DXRenderBase
     };
 
 public:
-    RenderR3Statistics Stats;
+    RenderR4Statistics Stats;
     // Sector detection and visibility
     CSector* pLastSector;
     Fvector vLastCameraPos;
@@ -156,7 +151,7 @@ class CRender : public D3DXRenderBase
     // Global vertex-buffer container
     xr_vector<FSlideWindowItem> SWIs;
     xr_vector<ref_shader> Shaders;
-    typedef svector<D3DVERTEXELEMENT9,MAXD3DDECLLENGTH + 1> VertexDeclarator;
+    typedef svector<D3DVERTEXELEMENT9, MAXD3DDECLLENGTH + 1> VertexDeclarator;
     xr_vector<VertexDeclarator> nDC, xDC;
     xr_vector<GLuint> nVB, xVB;
     xr_vector<GLuint> nIB, xIB;

diff --git a/src/Layers/xrRenderPC_R4/r4.h b/src/Layers/xrRenderPC_R4/r4.h
@@ -97,7 +97,7 @@ class CRender : public D3DXRenderBase
         u32 dx10_msaa : 1; //	DX10.0 path
         u32 dx10_msaa_hybrid : 1; //	DX10.0 main path with DX10.1 A-test msaa allowed
         u32 dx10_msaa_opt : 1; //	DX10.1 path
-        u32 dx10_gbuffer_opt : 1; //
+        u32 dx10_gbuffer_opt : 1; //	
         u32 dx10_sm4_1 : 1; //	DX10.1 path
         u32 dx10_msaa_alphatest : 2; //	A-test mode
         u32 dx10_msaa_samples : 4;
@@ -373,6 +373,7 @@ class CRender : public D3DXRenderBase
 
     void addShaderOption(const char* name, const char* value);
     void clearAllShaderOptions() { m_ShaderOptions.clear(); }
+
 private:
     xr_vector<D3D_SHADER_MACRO> m_ShaderOptions;