shaders: Add GLSL port of accum_sun.

digitall · Mar 6, 2016 · 11d9066 · 11d9066
1 parent acecea9
commit 11d9066
Show file tree

Hide file tree

Showing 44 changed files with 1,624 additions and 4 deletions.
diff --git a/res/gamedata/shaders/gl/accum_sun.ps b/res/gamedata/shaders/gl/accum_sun.ps
diff --git a/res/gamedata/shaders/gl/accum_sun.vs b/res/gamedata/shaders/gl/accum_sun.vs
@@ -0,0 +1,21 @@
+#include "common.h"
+#include "iostructs\v_volume.h"
+
+//////////////////////////////////////////////////////////////////////////////////////////
+uniform float4x4	m_texgen;
+#ifdef	USE_SJITTER
+uniform float4x4	m_texgen_J;
+#endif
+
+//////////////////////////////////////////////////////////////////////////////////////////
+// Vertex
+v2p_volume _main ( float4 P )
+{
+	v2p_volume	O;
+	O.hpos 		= mul( m_WVP, P );
+	O.tc 		= mul( m_texgen, P );
+#ifdef	USE_SJITTER
+	O.tcJ 		= mul( m_texgen_J, P );
+#endif
+ 	return	O;
+}
diff --git a/res/gamedata/shaders/gl/accum_sun_far.ps b/res/gamedata/shaders/gl/accum_sun_far.ps
diff --git a/res/gamedata/shaders/gl/accum_sun_far_msaa.ps b/res/gamedata/shaders/gl/accum_sun_far_msaa.ps
diff --git a/res/gamedata/shaders/gl/accum_sun_far_nomsaa.ps b/res/gamedata/shaders/gl/accum_sun_far_nomsaa.ps
diff --git a/res/gamedata/shaders/gl/accum_sun_mask.ps b/res/gamedata/shaders/gl/accum_sun_mask.ps
diff --git a/res/gamedata/shaders/gl/accum_sun_mask_msaa.ps b/res/gamedata/shaders/gl/accum_sun_mask_msaa.ps
diff --git a/res/gamedata/shaders/gl/accum_sun_mask_nomsaa.ps b/res/gamedata/shaders/gl/accum_sun_mask_nomsaa.ps
diff --git a/res/gamedata/shaders/gl/accum_sun_msaa.ps b/res/gamedata/shaders/gl/accum_sun_msaa.ps
diff --git a/res/gamedata/shaders/gl/accum_sun_near.ps b/res/gamedata/shaders/gl/accum_sun_near.ps
diff --git a/res/gamedata/shaders/gl/accum_sun_near_msaa.ps b/res/gamedata/shaders/gl/accum_sun_near_msaa.ps
diff --git a/res/gamedata/shaders/gl/accum_sun_near_msaa_minmax.ps b/res/gamedata/shaders/gl/accum_sun_near_msaa_minmax.ps
diff --git a/res/gamedata/shaders/gl/accum_sun_near_msaa_nominmax.ps b/res/gamedata/shaders/gl/accum_sun_near_msaa_nominmax.ps
diff --git a/res/gamedata/shaders/gl/accum_sun_near_nomsaa.ps b/res/gamedata/shaders/gl/accum_sun_near_nomsaa.ps
diff --git a/res/gamedata/shaders/gl/accum_sun_near_nomsaa_minmax.ps b/res/gamedata/shaders/gl/accum_sun_near_nomsaa_minmax.ps
diff --git a/res/gamedata/shaders/gl/accum_sun_near_nomsaa_nominmax.ps b/res/gamedata/shaders/gl/accum_sun_near_nomsaa_nominmax.ps
diff --git a/res/gamedata/shaders/gl/accum_sun_nomsaa.ps b/res/gamedata/shaders/gl/accum_sun_nomsaa.ps
diff --git a/res/gamedata/shaders/gl/accum_volumetric.s b/res/gamedata/shaders/gl/accum_volumetric.s
@@ -6,6 +6,7 @@ function normal		(shader, t_base, t_second, t_detail)
 --			: aref 		(true,0)
 			: sorting	(2, false)
 	shader:sampler	("s_lmap")      :texture	(t_base): clamp()
+	shader:sampler	("s_dmap")      :texture	("$user$smap_depth")
 	shader:sampler	("s_smap")      :texture	("$user$smap_depth") : comp_less ()
 	shader:sampler	("s_noise")    	:texture	("fx\\fx_noise")	: f_linear ()
 end
diff --git a/res/gamedata/shaders/gl/accum_volumetric_nomsaa.s b/res/gamedata/shaders/gl/accum_volumetric_nomsaa.s
@@ -6,6 +6,7 @@ function normal		(shader, t_base, t_second, t_detail)
 --			: aref 		(true,0)
 			: sorting	(2, false)
 	shader:sampler	("s_lmap")      :texture	(t_base): clamp()
+	shader:sampler	("s_dmap")      :texture	("$user$smap_depth")
 	shader:sampler	("s_smap")      :texture	("$user$smap_depth") : comp_less ()
 	shader:sampler	("s_noise")    	:texture	("fx\\fx_noise")	: f_linear ()
 end
diff --git a/res/gamedata/shaders/gl/accum_volumetric_sun.s b/res/gamedata/shaders/gl/accum_volumetric_sun.s
@@ -5,6 +5,7 @@ function normal		(shader, t_base, t_second, t_detail)
 			: blend		(true,blend.one,blend.one)
 			: sorting	(2, false)
 --	TODO: DX10: Implement for near and far phase.
+	shader:sampler	("s_dmap")      :texture ("$user$smap_depth")
 	shader:sampler	("s_smap")      :texture ("$user$smap_depth") : comp_less ()
 	shader:sampler	("s_position")	:texture ("$user$position")
 	shader:sampler	("jitter0")	:texture ("$user$jitter_0") : f_none ()

diff --git a/res/gamedata/shaders/gl/accum_volumetric_sun_minmax.s b/res/gamedata/shaders/gl/accum_volumetric_sun_minmax.s
@@ -5,6 +5,7 @@ function normal		(shader, t_base, t_second, t_detail)
 			: blend		(true,blend.one,blend.one)
 			: sorting	(2, false)
 --	TODO: DX10: Implement for near and far phase.
+	shader:sampler	("s_dmap")      :texture ("$user$smap_depth")
 	shader:sampler	("s_smap")      :texture ("$user$smap_depth") : comp_less ()
 	shader:sampler	("s_position")	:texture ("$user$position")
 	shader:sampler	("jitter0")	:texture ("$user$jitter_0") : f_none ()

diff --git a/res/gamedata/shaders/gl/accum_volumetric_sun_msaa0.s b/res/gamedata/shaders/gl/accum_volumetric_sun_msaa0.s
@@ -5,6 +5,7 @@ function normal		(shader, t_base, t_second, t_detail)
 			: blend		(true,blend.one,blend.one)
 			: sorting	(2, false)
 --	TODO: DX10: Implement for near and far phase.
+	shader:sampler	("s_dmap")      :texture ("$user$smap_depth")
 	shader:sampler	("s_smap")      :texture ("$user$smap_depth") : comp_less ()
 	shader:sampler	("s_position")	:texture ("$user$position")
 	shader:sampler	("jitter0")	:texture ("$user$jitter_0") : f_none ()

diff --git a/res/gamedata/shaders/gl/accum_volumetric_sun_msaa1.s b/res/gamedata/shaders/gl/accum_volumetric_sun_msaa1.s
@@ -5,6 +5,7 @@ function normal		(shader, t_base, t_second, t_detail)
 			: blend		(true,blend.one,blend.one)
 			: sorting	(2, false)
 --	TODO: DX10: Implement for near and far phase.
+	shader:sampler	("s_dmap")      :texture ("$user$smap_depth")
 	shader:sampler	("s_smap")      :texture ("$user$smap_depth") : comp_less ()
 	shader:sampler	("s_position")	:texture ("$user$position")
 	shader:sampler	("jitter0")	:texture ("$user$jitter_0") : f_none ()

diff --git a/res/gamedata/shaders/gl/accum_volumetric_sun_msaa2.s b/res/gamedata/shaders/gl/accum_volumetric_sun_msaa2.s
@@ -5,6 +5,7 @@ function normal		(shader, t_base, t_second, t_detail)
 			: blend		(true,blend.one,blend.one)
 			: sorting	(2, false)
 --	TODO: DX10: Implement for near and far phase.
+	shader:sampler	("s_dmap")      :texture ("$user$smap_depth")
 	shader:sampler	("s_smap")      :texture ("$user$smap_depth") : comp_less ()
 	shader:sampler	("s_position")	:texture ("$user$position")
 	shader:sampler	("jitter0")	:texture ("$user$jitter_0") : f_none ()

diff --git a/res/gamedata/shaders/gl/accum_volumetric_sun_msaa3.s b/res/gamedata/shaders/gl/accum_volumetric_sun_msaa3.s
@@ -5,6 +5,7 @@ function normal		(shader, t_base, t_second, t_detail)
 			: blend		(true,blend.one,blend.one)
 			: sorting	(2, false)
 --	TODO: DX10: Implement for near and far phase.
+	shader:sampler	("s_dmap")      :texture ("$user$smap_depth")
 	shader:sampler	("s_smap")      :texture ("$user$smap_depth") : comp_less ()
 	shader:sampler	("s_position")	:texture ("$user$position")
 	shader:sampler	("jitter0")	:texture ("$user$jitter_0") : f_none ()

diff --git a/res/gamedata/shaders/gl/accum_volumetric_sun_msaa4.s b/res/gamedata/shaders/gl/accum_volumetric_sun_msaa4.s
@@ -5,6 +5,7 @@ function normal		(shader, t_base, t_second, t_detail)
 			: blend		(true,blend.one,blend.one)
 			: sorting	(2, false)
 --	TODO: DX10: Implement for near and far phase.
+	shader:sampler	("s_dmap")      :texture ("$user$smap_depth")
 	shader:sampler	("s_smap")      :texture ("$user$smap_depth") : comp_less ()
 	shader:sampler	("s_position")	:texture ("$user$position")
 	shader:sampler	("jitter0")	:texture ("$user$jitter_0") : f_none ()

diff --git a/res/gamedata/shaders/gl/accum_volumetric_sun_msaa5.s b/res/gamedata/shaders/gl/accum_volumetric_sun_msaa5.s
@@ -5,6 +5,7 @@ function normal		(shader, t_base, t_second, t_detail)
 			: blend		(true,blend.one,blend.one)
 			: sorting	(2, false)
 --	TODO: DX10: Implement for near and far phase.
+	shader:sampler	("s_dmap")      :texture ("$user$smap_depth")
 	shader:sampler	("s_smap")      :texture ("$user$smap_depth") : comp_less ()
 	shader:sampler	("s_position")	:texture ("$user$position")
 	shader:sampler	("jitter0")	:texture ("$user$jitter_0") : f_none ()

diff --git a/res/gamedata/shaders/gl/accum_volumetric_sun_msaa6.s b/res/gamedata/shaders/gl/accum_volumetric_sun_msaa6.s
@@ -5,6 +5,7 @@ function normal		(shader, t_base, t_second, t_detail)
 			: blend		(true,blend.one,blend.one)
 			: sorting	(2, false)
 --	TODO: DX10: Implement for near and far phase.
+	shader:sampler	("s_dmap")      :texture ("$user$smap_depth")
 	shader:sampler	("s_smap")      :texture ("$user$smap_depth") : comp_less ()
 	shader:sampler	("s_position")	:texture ("$user$position")
 	shader:sampler	("jitter0")	:texture ("$user$jitter_0") : f_none ()

diff --git a/res/gamedata/shaders/gl/accum_volumetric_sun_msaa7.s b/res/gamedata/shaders/gl/accum_volumetric_sun_msaa7.s
@@ -5,6 +5,7 @@ function normal		(shader, t_base, t_second, t_detail)
 			: blend		(true,blend.one,blend.one)
 			: sorting	(2, false)
 --	TODO: DX10: Implement for near and far phase.
+	shader:sampler	("s_dmap")      :texture ("$user$smap_depth")
 	shader:sampler	("s_smap")      :texture ("$user$smap_depth") : comp_less ()
 	shader:sampler	("s_position")	:texture ("$user$position")
 	shader:sampler	("jitter0")	:texture ("$user$jitter_0") : f_none ()

diff --git a/res/gamedata/shaders/gl/accum_volumetric_sun_nomsaa.s b/res/gamedata/shaders/gl/accum_volumetric_sun_nomsaa.s
@@ -5,8 +5,9 @@ function normal		(shader, t_base, t_second, t_detail)
 			: blend		(true,blend.one,blend.one)
 			: sorting	(2, false)
 --	TODO: DX10: Implement for near and far phase.
+	shader:sampler	("s_dmap")      :texture ("$user$smap_depth")
 	shader:sampler	("s_smap")      :texture ("$user$smap_depth") : comp_less ()
-	shader:sampler	("s_smap_minmax")	:texture ("$user$smap_depth_minmax") : comp_less ()
+	shader:sampler	("s_smap_minmax")	:texture ("$user$smap_depth_minmax")
 	shader:sampler	("s_position")	:texture ("$user$position")
 	shader:sampler	("jitter0")	:texture ("$user$jitter_0") : f_none ()
 end
diff --git a/res/gamedata/shaders/gl/accum_volumetric_sun_nomsaa_minmax.s b/res/gamedata/shaders/gl/accum_volumetric_sun_nomsaa_minmax.s
@@ -5,8 +5,9 @@ function normal		(shader, t_base, t_second, t_detail)
 			: blend		(true,blend.one,blend.one)
 			: sorting	(2, false)
 --	TODO: DX10: Implement for near and far phase.
+	shader:sampler	("s_dmap")      :texture ("$user$smap_depth")
 	shader:sampler	("s_smap")      :texture ("$user$smap_depth") : comp_less ()
-	shader:sampler	("s_smap_minmax")	:texture ("$user$smap_depth_minmax") : comp_less ()
+	shader:sampler	("s_smap_minmax")	:texture ("$user$smap_depth_minmax")
 	shader:sampler	("s_position")	:texture ("$user$position")
 	shader:sampler	("jitter0")	:texture ("$user$jitter_0") : f_none ()
 end
diff --git a/res/gamedata/shaders/gl/common.h b/res/gamedata/shaders/gl/common.h
@@ -3,12 +3,20 @@
 
 #include "shared\common.h"
 
+// TODO: OGL: Move to cbuffers
+uniform half4                hemi_cube_pos_faces;
+uniform half4                hemi_cube_neg_faces;
+uniform half4                L_material;                            // 0,0,0,mid
+uniform half4                Ldynamic_color;                      // dynamic light color (rgb1)        - spot/point
+uniform half4                Ldynamic_pos;                       // dynamic light pos+1/range(w) - spot/point
+uniform half4                Ldynamic_dir;                        // dynamic light direction         - sun
+
 #include "common_defines.h"
-//include "common_policies.h"
+#include "common_policies.h"
 #include "common_iostructs.h"
 #include "common_samplers.h"
 //include "common_cbuffers.h"
-//include "common_functions.h"
+#include "common_functions.h"
 
 // #define USE_SUPER_SPECULAR