Skip to content

Commit 3e4cf54

Browse files
committed
Just some formatting for r4.h and rgl.h
1 parent b7f5c3c commit 3e4cf54

File tree

2 files changed

+6
-10
lines changed
  • src/Layers

2 files changed

+6
-10
lines changed

src/Layers/xrRenderPC_GL/rgl.h

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ class CRender : public D3DXRenderBase
106106
float forcegloss_v;
107107
} o;
108108

109-
struct RenderR3Statistics
109+
struct RenderR4Statistics
110110
{
111111
u32 l_total;
112112
u32 l_visible;
@@ -115,13 +115,10 @@ class CRender : public D3DXRenderBase
115115
s32 s_used;
116116
s32 s_merged;
117117
s32 s_finalclip;
118-
u32 o_queries;
119-
u32 o_culled;
120118
u32 ic_total;
121119
u32 ic_culled;
122120

123-
RenderR3Statistics() { FrameStart(); }
124-
121+
RenderR4Statistics() { FrameStart(); }
125122
void FrameStart()
126123
{
127124
l_total = 0;
@@ -131,8 +128,6 @@ class CRender : public D3DXRenderBase
131128
s_used = 0;
132129
s_merged = 0;
133130
s_finalclip = 0;
134-
o_queries = 0;
135-
o_culled = 0;
136131
ic_total = 0;
137132
ic_culled = 0;
138133
}
@@ -141,7 +136,7 @@ class CRender : public D3DXRenderBase
141136
};
142137

143138
public:
144-
RenderR3Statistics Stats;
139+
RenderR4Statistics Stats;
145140
// Sector detection and visibility
146141
CSector* pLastSector;
147142
Fvector vLastCameraPos;
@@ -156,7 +151,7 @@ class CRender : public D3DXRenderBase
156151
// Global vertex-buffer container
157152
xr_vector<FSlideWindowItem> SWIs;
158153
xr_vector<ref_shader> Shaders;
159-
typedef svector<D3DVERTEXELEMENT9,MAXD3DDECLLENGTH + 1> VertexDeclarator;
154+
typedef svector<D3DVERTEXELEMENT9, MAXD3DDECLLENGTH + 1> VertexDeclarator;
160155
xr_vector<VertexDeclarator> nDC, xDC;
161156
xr_vector<GLuint> nVB, xVB;
162157
xr_vector<GLuint> nIB, xIB;

src/Layers/xrRenderPC_R4/r4.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ class CRender : public D3DXRenderBase
9797
u32 dx10_msaa : 1; // DX10.0 path
9898
u32 dx10_msaa_hybrid : 1; // DX10.0 main path with DX10.1 A-test msaa allowed
9999
u32 dx10_msaa_opt : 1; // DX10.1 path
100-
u32 dx10_gbuffer_opt : 1; //
100+
u32 dx10_gbuffer_opt : 1; //
101101
u32 dx10_sm4_1 : 1; // DX10.1 path
102102
u32 dx10_msaa_alphatest : 2; // A-test mode
103103
u32 dx10_msaa_samples : 4;
@@ -373,6 +373,7 @@ class CRender : public D3DXRenderBase
373373

374374
void addShaderOption(const char* name, const char* value);
375375
void clearAllShaderOptions() { m_ShaderOptions.clear(); }
376+
376377
private:
377378
xr_vector<D3D_SHADER_MACRO> m_ShaderOptions;
378379

0 commit comments

Comments
 (0)