xrRender_GL: another portion of shaders fixes..

OpenXRay · Jul 1, 2018 · 40c6065 · 40c6065
1 parent ced80b9
commit 40c6065
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 6 deletions.
diff --git a/res/gamedata/shaders/gl/combine_1.ps b/res/gamedata/shaders/gl/combine_1.ps
diff --git a/res/gamedata/shaders/gl/deffer_tree_bump.vs b/res/gamedata/shaders/gl/deffer_tree_bump.vs
@@ -17,7 +17,7 @@ v2p_bumped 	_main 	(v_tree I)
 	float3 	pos		= mul			(m_xform, I.P);
 
 	//
-	float 	base 	= m_xform._42	;		// take base height from matrix
+	float 	base 	= m_xform[3][1]	;		// take base height from matrix
 	float 	dp		= calc_cyclic  	(wave.w+dot(pos,float3(wave)));
 	float 	H 		= pos.y - base	;		// height of vertex (scaled, rotated, etc.)
 	float 	frac 	= I.tc.z*consts.x;		// fractional (or rigidity)

diff --git a/res/gamedata/shaders/gl/deffer_tree_flat.vs b/res/gamedata/shaders/gl/deffer_tree_flat.vs
@@ -19,14 +19,14 @@ v2p_flat _main (v_tree I)
 	float3 	pos		= mul		(m_xform, I.P);
 
 	//
-	float 	base 	= m_xform._42;			// take base height from matrix
+	float 	base 	= m_xform[3][1];			// take base height from matrix
 	float 	dp		= calc_cyclic  (wave.w+dot(pos,float3(wave)));
 	float 	H 		= pos.y - base;			// height of vertex (scaled, rotated, etc.)
 	float 	frac 	= I.tc.z*consts.x;		// fractional (or rigidity)
 	float 	inten 	= H * dp;			// intensity
 	float2 	result	= calc_xz_wave	(wind.xz*inten, frac);
 #ifdef		USE_TREEWAVE
-			result	= 0;
+			result	= float2(0);
 #endif
 	float4 	f_pos 	= float4(pos.x+result.x, pos.y, pos.z+result.y, 1);
 

diff --git a/res/gamedata/shaders/gl/hud3d.vs b/res/gamedata/shaders/gl/hud3d.vs
@@ -7,7 +7,7 @@ v2p_TL _main (v_TL I)
 
 	O.Tex0		= I.Tex0;
 	O.HPos		= I.P;
-	O.P.w		= 1;
-	O.P			= mul( m_WVP, O.P );
+	O.HPos.w	= 1;
+	O.HPos		= mul( m_WVP, O.HPos );
 	return 		O;
 }
diff --git a/res/gamedata/shaders/gl/iostructs/v_particle.h b/res/gamedata/shaders/gl/iostructs/v_particle.h
@@ -44,6 +44,8 @@ void main()
 
 	v2p_particle_tc = O.tc;
 	v2p_particle_c = O.c;
+#ifdef	USE_SOFT_PARTICLES
 	v2p_particle_tctexgen = O.tctexgen;
+#endif
 	gl_Position = O.hpos;
 }
diff --git a/res/gamedata/shaders/gl/particle_alphaonly.ps b/res/gamedata/shaders/gl/particle_alphaonly.ps
diff --git a/res/gamedata/shaders/gl/shadow_direct_tree.vs b/res/gamedata/shaders/gl/shadow_direct_tree.vs
@@ -25,7 +25,7 @@ v2p_shadow_direct _main ( v_shadow_direct I )
 	float3 	pos	= mul		(m_xform , I.P);
 
 	// 
-	float 	base 	= m_xform._42;			// take base height from matrix
+	float 	base 	= m_xform[3][1];			// take base height from matrix
 	float 	dp		= calc_cyclic  (wave.w+dot(pos,float3(wave)));
 	float 	H 		= pos.y - base;			// height of vertex (scaled, rotated, etc.)
 	float 	inten 	= H * dp;			// intensity

diff --git a/res/gamedata/shaders/gl/ssao_calc.ps b/res/gamedata/shaders/gl/ssao_calc.ps
diff --git a/res/gamedata/shaders/gl/ssao_hbao.ps b/res/gamedata/shaders/gl/ssao_hbao.ps