Compiler warnings removed.

tamlin-mike · Xottab-DUTY · commit 276eb24ad500 · 2018-01-10T03:16:40.000+05:00
diff --git a/src/Layers/xrRender/HOM.h b/src/Layers/xrRender/HOM.h
@@ -51,7 +51,7 @@ class CHOM
     void Render_ZB();
     //	void					Debug		();
 
-    void occlude(Fbox2& space) {}
+    void occlude(Fbox2& /*space*/) {}
     void Disable();
     void Enable();
 
diff --git a/src/Layers/xrRender/LightTrack.h b/src/Layers/xrRender/LightTrack.h
@@ -82,9 +82,9 @@ class CROS_impl : public IRender_ObjectSpecific
     virtual void force_mode(u32 mode) { MODE = mode; };
     virtual float get_luminocity()
     {
-        float result = _max(approximate.x, _max(approximate.y, approximate.z));
-        clamp(result, 0.f, 1.f);
-        return (result);
+        float result_ = _max(approximate.x, _max(approximate.y, approximate.z));
+        clamp(result_, 0.f, 1.f);
+        return (result_);
     };
     virtual float get_luminocity_hemi() { return get_hemi(); }
     virtual float* get_luminocity_hemi_cube() { return hemi_cube_smooth; }
diff --git a/src/Layers/xrRender/light.h b/src/Layers/xrRender/light.h
@@ -113,7 +113,7 @@ class light : public IRender_Light, public SpatialBase
     virtual void set_rotation(const Fvector& D, const Fvector& R);
     virtual void set_cone(float angle);
     virtual void set_range(float R);
-    virtual void set_virtual_size(float R){};
+    virtual void set_virtual_size(float /*R*/){};
     virtual void set_color(const Fcolor& C) { color.set(C); }
     virtual void set_color(float r, float g, float b) { color.set(r, g, b, 1); }
     virtual void set_texture(LPCSTR name);
diff --git a/src/Layers/xrRenderGL/glBufferUtils.cpp b/src/Layers/xrRenderGL/glBufferUtils.cpp
@@ -24,7 +24,7 @@ void	CreateIndexBuffer(GLuint* pBuffer, const void* pData, UINT DataSize, bool b
 	return CreateBuffer(pBuffer, pData, DataSize, bImmutable, true);
 }
 
-GLsizei	VertexSizeList[] =
+const GLsizei VertexSizeList[] =
 {
 	1,	// D3DDECLTYPE_FLOAT1
 	2,	// D3DDECLTYPE_FLOAT2
@@ -45,7 +45,7 @@ GLsizei	VertexSizeList[] =
 	4	// D3DDECLTYPE_FLOAT16_4
 };
 
-GLenum	VertexTypeList[] =
+const GLenum VertexTypeList[] =
 {
 	GL_FLOAT,			// D3DDECLTYPE_FLOAT1
 	GL_FLOAT,			// D3DDECLTYPE_FLOAT2
@@ -66,7 +66,7 @@ GLenum	VertexTypeList[] =
 	GL_HALF_FLOAT		// D3DDECLTYPE_FLOAT16_4
 };
 
-GLboolean	VertexNormalizedList[] =
+const GLboolean VertexNormalizedList[] =
 {
 	GL_FALSE,	// D3DDECLTYPE_FLOAT1
 	GL_FALSE,	// D3DDECLTYPE_FLOAT2
@@ -87,7 +87,7 @@ GLboolean	VertexNormalizedList[] =
 	GL_FALSE	// D3DDECLTYPE_FLOAT16_4
 };
 
-GLsizei	VertexTypeSizeList[] =
+const GLsizei VertexTypeSizeList[] =
 {
 	sizeof(GLfloat),	// D3DDECLTYPE_FLOAT1
 	sizeof(GLfloat),	// D3DDECLTYPE_FLOAT2
@@ -108,22 +108,22 @@ GLsizei	VertexTypeSizeList[] =
 	sizeof(GLhalf)		// D3DDECLTYPE_FLOAT16_4
 };
 
-GLuint	VertexUsageList[] =
+const GLuint VertexUsageList[] =
 {
 	3,	// D3DDECLUSAGE_POSITION
-	-1,	// D3DDECLUSAGE_BLENDWEIGHT
-	-1,	// D3DDECLUSAGE_BLENDINDICES
+	~0u,	// D3DDECLUSAGE_BLENDWEIGHT
+	~0u,	// D3DDECLUSAGE_BLENDINDICES
 	5,	// D3DDECLUSAGE_NORMAL
-	-1,	// D3DDECLUSAGE_PSIZE
+	~0u,	// D3DDECLUSAGE_PSIZE
 	8,	// D3DDECLUSAGE_TEXCOORD
 	4,	// D3DDECLUSAGE_TANGENT
 	6,	// D3DDECLUSAGE_BINORMAL
-	-1,	// D3DDECLUSAGE_TESSFACTOR
-	-1,	// D3DDECLUSAGE_POSITIONT
+	~0u,	// D3DDECLUSAGE_TESSFACTOR
+	~0u,	// D3DDECLUSAGE_POSITIONT
 	0,	// D3DDECLUSAGE_COLOR
 	7,	// D3DDECLUSAGE_FOG
-	-1,	// D3DDECLUSAGE_DEPTH
-	-1,	// D3DDECLUSAGE_SAMPLE
+	~0u,	// D3DDECLUSAGE_DEPTH
+	~0u,	// D3DDECLUSAGE_SAMPLE
 };
 
 GLsizei GetDeclVertexSize(const D3DVERTEXELEMENT9* decl)
@@ -145,6 +145,7 @@ void ConvertVertexDeclaration(const D3DVERTEXELEMENT9* dxdecl, SDeclaration* dec
 {
 	RCache.set_Format(decl);
 
+	// XXX: tamlin: use 'stride', or drop it.
 	GLsizei stride = GetDeclVertexSize(dxdecl);
 	for (int i = 0; i < MAXD3DDECLLENGTH; ++i)
 	{
@@ -279,4 +280,4 @@ u32 GetDeclLength(const D3DVERTEXELEMENT9 *decl)
 	return element - decl;
 }
 
-};
+} // namespace glBufferUtils
diff --git a/src/Layers/xrRenderGL/glHW.cpp b/src/Layers/xrRenderGL/glHW.cpp
@@ -23,8 +23,8 @@ void	free_render_mode_list		()			{}
 
 CHW			HW;
 
-void CALLBACK OnDebugCallback(GLenum source, GLenum type, GLuint id, GLenum severity,
-	GLsizei length, const GLchar* message, const void* userParam)
+void CALLBACK OnDebugCallback(GLenum /*source*/, GLenum /*type*/, GLuint id, GLenum severity,
+	GLsizei /*length*/, const GLchar* message, const void* /*userParam*/)
 {
 	if (severity != GL_DEBUG_SEVERITY_NOTIFICATION)
 		Log(message, id);
diff --git a/src/Layers/xrRenderGL/glR_Backend_Runtime.h b/src/Layers/xrRenderGL/glR_Backend_Runtime.h
@@ -70,7 +70,9 @@ ICF void CBackend::set_PS(GLuint _ps, LPCSTR _n)
 {
 	if (ps != _ps)
 	{
+#ifdef RBackend_PGO
 		string_path name;
+#endif
 		PGO(glGetObjectLabel(GL_PROGRAM, _ps, sizeof(name), nullptr, name));
 		PGO(Msg("PGO:Pshader:%d,%s", _ps, _n ? _n : name));
 		stat.ps++;
@@ -86,7 +88,9 @@ ICF void CBackend::set_GS(GLuint _gs, LPCSTR _n)
 {
 	if (gs != _gs)
 	{
+#ifdef RBackend_PGO
 		string_path name;
+#endif
 		PGO(glGetObjectLabel(GL_PROGRAM, _ps, sizeof(name), nullptr, name));
 		PGO(Msg("PGO:Gshader:%d,%s", _ps, _n ? _n : name));
 		//	TODO: OGL: Get statistics for G Shader change
@@ -103,7 +107,9 @@ ICF void CBackend::set_VS(GLuint _vs, LPCSTR _n)
 {
 	if (vs != _vs)
 	{
+#ifdef RBackend_PGO
 		string_path name;
+#endif
 		PGO(glGetObjectLabel(GL_PROGRAM, _vs, sizeof(name), nullptr, name));
 		PGO(Msg("PGO:Vshader:%d,%s", _vs, _n ? _n : name));
 		stat.vs++;
diff --git a/src/Layers/xrRenderGL/glSH_RT.cpp b/src/Layers/xrRenderGL/glSH_RT.cpp
@@ -38,8 +38,9 @@ void CRT::create	(LPCSTR Name, u32 w, u32 h,	D3DFORMAT f, u32 SampleCount )
 	CHK_GL(glGetIntegerv(GL_MAX_FRAMEBUFFER_HEIGHT, &max_height));
 
 	// Check width-and-height of render target surface
-	if (w>max_width)		return;
-	if (h>max_height)		return;
+	// XXX: While seemingly silly, assert w/h are positive?
+	if (w>u32(max_width))		return;
+	if (h>u32(max_height))		return;
 
 	RImplementation.Resources->Evict();
 
@@ -58,23 +59,26 @@ void CRT::create	(LPCSTR Name, u32 w, u32 h,	D3DFORMAT f, u32 SampleCount )
 	pZRT = pRT;
 }
 
-void CRT::destroy		()
+void CRT::destroy()
 {
 	if (pTexture._get())	{
 		pTexture->surface_set(target, 0);
 		pTexture = NULL;
 	}
 	CHK_GL(glDeleteTextures(1, &pRT));
 }
-void CRT::reset_begin	()
+
+void CRT::reset_begin()
 {
 	destroy		();
 }
-void CRT::reset_end		()
+
+void CRT::reset_end()
 {
-	create		(*cName,dwWidth,dwHeight,fmt);
+	create(*cName,dwWidth,dwHeight,fmt);
 }
-void resptrcode_crt::create(LPCSTR Name, u32 w, u32 h, D3DFORMAT f, u32 SampleCount)
+
+void resptrcode_crt::create(LPCSTR Name, u32 w, u32 h, D3DFORMAT f, u32 /*SampleCount*/)
 {
-	_set			(RImplementation.Resources->_CreateRT(Name,w,h,f));
+	_set(RImplementation.Resources->_CreateRT(Name,w,h,f));
 }
diff --git a/src/Layers/xrRenderPC_GL/gl_rendertarget.h b/src/Layers/xrRenderPC_GL/gl_rendertarget.h
@@ -328,7 +328,7 @@ class CRenderTarget		: public IRender_Target
 		dbg_lines.back().P1		= P1;
 		dbg_lines.back().color	= c;
 	}
-	IC void						dbg_addplane			(Fplane& P0,  u32 c)								{
+	IC void dbg_addplane(Fplane& P0,  u32 /*c*/) {
 		dbg_planes.push_back(P0);
 	}
 #else
diff --git a/src/Layers/xrRenderPC_GL/gl_rendertarget_phase_combine.cpp b/src/Layers/xrRenderPC_GL/gl_rendertarget_phase_combine.cpp
@@ -373,6 +373,7 @@ void	CRenderTarget::phase_combine	()
 
 		// Fill vertex buffer
 		v_aa* pv					= (v_aa*) RCache.Vertex.Lock	(4,g_aa_AA->vb_stride,Offset);
+		// XXX: tamlin: The following four lines are almost 300 columns wide! FIX!
 		pv->p.set(EPS,			float(_h+EPS),	EPS,1.f); pv->uv0.set(p0.x, p1.y);pv->uv1.set(p0.x-ddw,p1.y-ddh);pv->uv2.set(p0.x+ddw,p1.y+ddh);pv->uv3.set(p0.x+ddw,p1.y-ddh);pv->uv4.set(p0.x-ddw,p1.y+ddh);pv->uv5.set(p0.x-ddw,p1.y,p1.y,p0.x+ddw);pv->uv6.set(p0.x,p1.y-ddh,p1.y+ddh,p0.x);pv++;
 		pv->p.set(EPS,			EPS,			EPS,1.f); pv->uv0.set(p0.x, p0.y);pv->uv1.set(p0.x-ddw,p0.y-ddh);pv->uv2.set(p0.x+ddw,p0.y+ddh);pv->uv3.set(p0.x+ddw,p0.y-ddh);pv->uv4.set(p0.x-ddw,p0.y+ddh);pv->uv5.set(p0.x-ddw,p0.y,p0.y,p0.x+ddw);pv->uv6.set(p0.x,p0.y-ddh,p0.y+ddh,p0.x);pv++;
 		pv->p.set(float(_w+EPS),float(_h+EPS),	EPS,1.f); pv->uv0.set(p1.x, p1.y);pv->uv1.set(p1.x-ddw,p1.y-ddh);pv->uv2.set(p1.x+ddw,p1.y+ddh);pv->uv3.set(p1.x+ddw,p1.y-ddh);pv->uv4.set(p1.x-ddw,p1.y+ddh);pv->uv5.set(p1.x-ddw,p1.y,p1.y,p1.x+ddw);pv->uv6.set(p1.x,p1.y-ddh,p1.y+ddh,p1.x);pv++;
diff --git a/src/Layers/xrRenderPC_GL/rgl.cpp b/src/Layers/xrRenderPC_GL/rgl.cpp
@@ -95,7 +95,7 @@ static class cl_sun_shafts_intensity : public R_constant_setup
 
 static class cl_alpha_ref	: public R_constant_setup 
 {	
-	virtual void setup (R_constant* C) 
+	virtual void setup (R_constant* /*C*/) 
 	{ 
 		// TODO: OGL: Implement AlphaRef.
 		//StateManager.BindAlphaRef(C);
diff --git a/src/Layers/xrRenderPC_R2/r2_rendertarget.h b/src/Layers/xrRenderPC_R2/r2_rendertarget.h
@@ -313,7 +313,7 @@ class CRenderTarget : public IRender_Target
         dbg_addline(p3, p7, color);
         dbg_addline(p4, p8, color);
     }
-    IC void dbg_addplane(Fplane& P0, u32 c) { dbg_planes.push_back(P0); }
+    IC void dbg_addplane(Fplane& P0, u32 /*c*/) { dbg_planes.push_back(P0); }
 #else
     IC void dbg_addline(Fvector& P0, Fvector& P1, u32 c) {}
     IC void dbg_addplane(Fplane& P0, u32 c) {}
diff --git a/src/xrCore/_fbox2.h b/src/xrCore/_fbox2.h
@@ -32,10 +32,10 @@ class _box2
         max.set(_max);
         return *this;
     };
-    IC SelfRef set(T x1, T y1, T x2, T y2)
+    IC SelfRef set(T x1_, T y1_, T x2_, T y2_)
     {
-        min.set(x1, y1);
-        max.set(x2, y2);
+        min.set(x1_, y1_);
+        max.set(x2_, y2_);
         return *this;
     };
     IC SelfRef set(SelfCRef b)

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@ void free_render_mode_list () {}`
`23`	`23`
`24`	`24`	`CHW HW;`
`25`	`25`
`26`		`-void CALLBACK OnDebugCallback(GLenum source, GLenum type, GLuint id, GLenum severity,`
`27`		`- GLsizei length, const GLchar* message, const void* userParam)`
	`26`	`+void CALLBACK OnDebugCallback(GLenum /source/, GLenum /type/, GLuint id, GLenum severity,`
	`27`	`+ GLsizei /length/, const GLchar* message, const void* /userParam/)`
`28`	`28`	`{`
`29`	`29`	`if (severity != GL_DEBUG_SEVERITY_NOTIFICATION)`
`30`	`30`	`Log(message, id);`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,9 @@ ICF void CBackend::set_PS(GLuint _ps, LPCSTR _n)`
`70`	`70`	`{`
`71`	`71`	`if (ps != _ps)`
`72`	`72`	`{`
	`73`	`+#ifdef RBackend_PGO`
`73`	`74`	`string_path name;`
	`75`	`+#endif`
`74`	`76`	`PGO(glGetObjectLabel(GL_PROGRAM, _ps, sizeof(name), nullptr, name));`
`75`	`77`	`PGO(Msg("PGO:Pshader:%d,%s", _ps, _n ? _n : name));`
`76`	`78`	`stat.ps++;`
`@@ -86,7 +88,9 @@ ICF void CBackend::set_GS(GLuint _gs, LPCSTR _n)`
`86`	`88`	`{`
`87`	`89`	`if (gs != _gs)`
`88`	`90`	`{`
	`91`	`+#ifdef RBackend_PGO`
`89`	`92`	`string_path name;`
	`93`	`+#endif`
`90`	`94`	`PGO(glGetObjectLabel(GL_PROGRAM, _ps, sizeof(name), nullptr, name));`
`91`	`95`	`PGO(Msg("PGO:Gshader:%d,%s", _ps, _n ? _n : name));`
`92`	`96`	`// TODO: OGL: Get statistics for G Shader change`
`@@ -103,7 +107,9 @@ ICF void CBackend::set_VS(GLuint _vs, LPCSTR _n)`
`103`	`107`	`{`
`104`	`108`	`if (vs != _vs)`
`105`	`109`	`{`
	`110`	`+#ifdef RBackend_PGO`
`106`	`111`	`string_path name;`
	`112`	`+#endif`
`107`	`113`	`PGO(glGetObjectLabel(GL_PROGRAM, _vs, sizeof(name), nullptr, name));`
`108`	`114`	`PGO(Msg("PGO:Vshader:%d,%s", _vs, _n ? _n : name));`
`109`	`115`	`stat.vs++;`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,9 @@ void CRT::create (LPCSTR Name, u32 w, u32 h, D3DFORMAT f, u32 SampleCount )`
`38`	`38`	`CHK_GL(glGetIntegerv(GL_MAX_FRAMEBUFFER_HEIGHT, &max_height));`
`39`	`39`
`40`	`40`	`// Check width-and-height of render target surface`
`41`		`- if (w>max_width) return;`
`42`		`- if (h>max_height) return;`
	`41`	`+ // XXX: While seemingly silly, assert w/h are positive?`
	`42`	`+ if (w>u32(max_width)) return;`
	`43`	`+ if (h>u32(max_height)) return;`
`43`	`44`
`44`	`45`	`RImplementation.Resources->Evict();`
`45`	`46`
`@@ -58,23 +59,26 @@ void CRT::create (LPCSTR Name, u32 w, u32 h, D3DFORMAT f, u32 SampleCount )`
`58`	`59`	`pZRT = pRT;`
`59`	`60`	`}`
`60`	`61`
`61`		`-void CRT::destroy ()`
	`62`	`+void CRT::destroy()`
`62`	`63`	`{`
`63`	`64`	`if (pTexture._get()) {`
`64`	`65`	`pTexture->surface_set(target, 0);`
`65`	`66`	`pTexture = NULL;`
`66`	`67`	`}`
`67`	`68`	`CHK_GL(glDeleteTextures(1, &pRT));`
`68`	`69`	`}`
`69`		`-void CRT::reset_begin ()`
	`70`	`+`
	`71`	`+void CRT::reset_begin()`
`70`	`72`	`{`
`71`	`73`	`destroy ();`
`72`	`74`	`}`
`73`		`-void CRT::reset_end ()`
	`75`	`+`
	`76`	`+void CRT::reset_end()`
`74`	`77`	`{`
`75`		`- create (*cName,dwWidth,dwHeight,fmt);`
	`78`	`+ create(*cName,dwWidth,dwHeight,fmt);`
`76`	`79`	`}`
`77`		`-void resptrcode_crt::create(LPCSTR Name, u32 w, u32 h, D3DFORMAT f, u32 SampleCount)`
	`80`	`+`
	`81`	`+void resptrcode_crt::create(LPCSTR Name, u32 w, u32 h, D3DFORMAT f, u32 /SampleCount/)`
`78`	`82`	`{`
`79`		`- _set (RImplementation.Resources->_CreateRT(Name,w,h,f));`
	`83`	`+ _set(RImplementation.Resources->_CreateRT(Name,w,h,f));`
`80`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -328,7 +328,7 @@ class CRenderTarget : public IRender_Target`
`328`	`328`	`dbg_lines.back().P1 = P1;`
`329`	`329`	`dbg_lines.back().color = c;`
`330`	`330`	`}`
`331`		`- IC void dbg_addplane (Fplane& P0, u32 c) {`
	`331`	`+ IC void dbg_addplane(Fplane& P0, u32 /c/) {`
`332`	`332`	`dbg_planes.push_back(P0);`
`333`	`333`	`}`
`334`	`334`	`#else`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ static class cl_sun_shafts_intensity : public R_constant_setup`
`95`	`95`
`96`	`96`	`static class cl_alpha_ref : public R_constant_setup`
`97`	`97`	`{`
`98`		`- virtual void setup (R_constant* C)`
	`98`	`+ virtual void setup (R_constant* /C/)`
`99`	`99`	`{`
`100`	`100`	`// TODO: OGL: Implement AlphaRef.`
`101`	`101`	`//StateManager.BindAlphaRef(C);`