Skip to content

Commit e6798d5

Browse files
CrossVRCrossVR
committed
shaders: Edit blender scripts to use OpenGL samplers.
1 parent 635f365 commit e6798d5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+166
-517
lines changed

‎res/gamedata/shaders/gl/accum_volumetric.s‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,7 @@ function normal (shader, t_base, t_second, t_detail)
55
: blend (true,blend.one,blend.one)
66
-- : aref (true,0)
77
: sorting (2, false)
8-
-- TODO: Implement sampler states
9-
-- shader:sampler ("s_lmap") :texture (t_base): clamp()
10-
-- shader:sampler ("s_smap") :texture ("null")
11-
-- shader:sampler ("s_noise") :texture("fx\\fx_noise") : f_linear ()
12-
13-
shader:dx10texture ("s_lmap", t_base)
14-
shader:dx10texture ("s_smap", "null")
15-
shader:dx10texture ("s_noise", "fx\\fx_noise")
16-
17-
shader:dx10sampler ("smp_rtlinear")
18-
shader:dx10sampler ("smp_linear")
19-
-- shader:dx10sampler ("smp_jitter")
20-
shader:dx10sampler ("smp_smap")
8+
shader:sampler ("s_lmap") :texture (t_base): clamp()
9+
shader:sampler ("s_smap") :texture ("$user$smap_depth") : comp_less ()
10+
shader:sampler ("s_noise") :texture ("fx\\fx_noise") : f_linear ()
2111
end

‎res/gamedata/shaders/gl/accum_volumetric_nomsaa.s‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,7 @@ function normal (shader, t_base, t_second, t_detail)
55
: blend (true,blend.one,blend.one)
66
-- : aref (true,0)
77
: sorting (2, false)
8-
-- TODO: Implement sampler states
9-
-- shader:sampler ("s_lmap") :texture (t_base): clamp()
10-
-- shader:sampler ("s_smap") :texture ("null")
11-
-- shader:sampler ("s_noise") :texture("fx\\fx_noise") : f_linear ()
12-
13-
shader:dx10texture ("s_lmap", t_base)
14-
shader:dx10texture ("s_smap", "null")
15-
shader:dx10texture ("s_noise", "fx\\fx_noise")
16-
17-
shader:dx10sampler ("smp_rtlinear")
18-
shader:dx10sampler ("smp_linear")
19-
-- shader:dx10sampler ("smp_jitter")
20-
shader:dx10sampler ("smp_smap")
8+
shader:sampler ("s_lmap") :texture (t_base): clamp()
9+
shader:sampler ("s_smap") :texture ("$user$smap_depth") : comp_less ()
10+
shader:sampler ("s_noise") :texture ("fx\\fx_noise") : f_linear ()
2111
end

‎res/gamedata/shaders/gl/accum_volumetric_sun.s‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,7 @@ function normal (shader, t_base, t_second, t_detail)
55
: blend (true,blend.one,blend.one)
66
: sorting (2, false)
77
-- TODO: DX10: Implement for near and far phase.
8-
-- TODO: DX10: Setup samplers.
9-
-- shader:sampler ("s_smap") :texture ("null")
10-
-- shader:sampler ("s_position") :texture ("$user$position")
11-
-- shader:sampler ("jitter0") :texture ("$user$jitter_0") : f_none ()
12-
13-
shader:dx10texture ("s_smap", "null")
14-
shader:dx10texture ("s_smap_minmax", "$user$smap_depth_minmax");
15-
shader:dx10texture ("s_position", "$user$position")
16-
shader:dx10texture ("jitter0", "$user$jitter_0")
17-
18-
shader:dx10sampler ("smp_nofilter")
19-
shader:dx10sampler ("smp_jitter")
20-
shader:dx10sampler ("smp_smap")
8+
shader:sampler ("s_smap") :texture ("$user$smap_depth") : comp_less ()
9+
shader:sampler ("s_position") :texture ("$user$position")
10+
shader:sampler ("jitter0") :texture ("$user$jitter_0") : f_none ()
2111
end

‎res/gamedata/shaders/gl/accum_volumetric_sun_minmax.s‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,7 @@ function normal (shader, t_base, t_second, t_detail)
55
: blend (true,blend.one,blend.one)
66
: sorting (2, false)
77
-- TODO: DX10: Implement for near and far phase.
8-
-- TODO: DX10: Setup samplers.
9-
-- shader:sampler ("s_smap") :texture ("null")
10-
-- shader:sampler ("s_position") :texture ("$user$position")
11-
-- shader:sampler ("jitter0") :texture ("$user$jitter_0") : f_none ()
12-
13-
shader:dx10texture ("s_smap", "null")
14-
shader:dx10texture ("s_smap_minmax", "$user$smap_depth_minmax");
15-
shader:dx10texture ("s_position", "$user$position")
16-
shader:dx10texture ("jitter0", "$user$jitter_0")
17-
18-
shader:dx10sampler ("smp_nofilter")
19-
shader:dx10sampler ("smp_jitter")
20-
shader:dx10sampler ("smp_smap")
8+
shader:sampler ("s_smap") :texture ("$user$smap_depth") : comp_less ()
9+
shader:sampler ("s_position") :texture ("$user$position")
10+
shader:sampler ("jitter0") :texture ("$user$jitter_0") : f_none ()
2111
end

‎res/gamedata/shaders/gl/accum_volumetric_sun_msaa0.s‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,7 @@ function normal (shader, t_base, t_second, t_detail)
55
: blend (true,blend.one,blend.one)
66
: sorting (2, false)
77
-- TODO: DX10: Implement for near and far phase.
8-
-- TODO: DX10: Setup samplers.
9-
-- shader:sampler ("s_smap") :texture ("null")
10-
-- shader:sampler ("s_position") :texture ("$user$position")
11-
-- shader:sampler ("jitter0") :texture ("$user$jitter_0") : f_none ()
12-
13-
shader:dx10texture ("s_smap", "null")
14-
shader:dx10texture ("s_position", "$user$position")
15-
shader:dx10texture ("jitter0", "$user$jitter_0")
16-
17-
shader:dx10sampler ("smp_nofilter")
18-
shader:dx10sampler ("smp_jitter")
19-
shader:dx10sampler ("smp_smap")
8+
shader:sampler ("s_smap") :texture ("$user$smap_depth") : comp_less ()
9+
shader:sampler ("s_position") :texture ("$user$position")
10+
shader:sampler ("jitter0") :texture ("$user$jitter_0") : f_none ()
2011
end

‎res/gamedata/shaders/gl/accum_volumetric_sun_msaa1.s‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,7 @@ function normal (shader, t_base, t_second, t_detail)
55
: blend (true,blend.one,blend.one)
66
: sorting (2, false)
77
-- TODO: DX10: Implement for near and far phase.
8-
-- TODO: DX10: Setup samplers.
9-
-- shader:sampler ("s_smap") :texture ("null")
10-
-- shader:sampler ("s_position") :texture ("$user$position")
11-
-- shader:sampler ("jitter0") :texture ("$user$jitter_0") : f_none ()
12-
13-
shader:dx10texture ("s_smap", "null")
14-
shader:dx10texture ("s_position", "$user$position")
15-
shader:dx10texture ("jitter0", "$user$jitter_0")
16-
17-
shader:dx10sampler ("smp_nofilter")
18-
shader:dx10sampler ("smp_jitter")
19-
shader:dx10sampler ("smp_smap")
8+
shader:sampler ("s_smap") :texture ("$user$smap_depth") : comp_less ()
9+
shader:sampler ("s_position") :texture ("$user$position")
10+
shader:sampler ("jitter0") :texture ("$user$jitter_0") : f_none ()
2011
end

‎res/gamedata/shaders/gl/accum_volumetric_sun_msaa2.s‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,7 @@ function normal (shader, t_base, t_second, t_detail)
55
: blend (true,blend.one,blend.one)
66
: sorting (2, false)
77
-- TODO: DX10: Implement for near and far phase.
8-
-- TODO: DX10: Setup samplers.
9-
-- shader:sampler ("s_smap") :texture ("null")
10-
-- shader:sampler ("s_position") :texture ("$user$position")
11-
-- shader:sampler ("jitter0") :texture ("$user$jitter_0") : f_none ()
12-
13-
shader:dx10texture ("s_smap", "null")
14-
shader:dx10texture ("s_position", "$user$position")
15-
shader:dx10texture ("jitter0", "$user$jitter_0")
16-
17-
shader:dx10sampler ("smp_nofilter")
18-
shader:dx10sampler ("smp_jitter")
19-
shader:dx10sampler ("smp_smap")
8+
shader:sampler ("s_smap") :texture ("$user$smap_depth") : comp_less ()
9+
shader:sampler ("s_position") :texture ("$user$position")
10+
shader:sampler ("jitter0") :texture ("$user$jitter_0") : f_none ()
2011
end

‎res/gamedata/shaders/gl/accum_volumetric_sun_msaa3.s‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,7 @@ function normal (shader, t_base, t_second, t_detail)
55
: blend (true,blend.one,blend.one)
66
: sorting (2, false)
77
-- TODO: DX10: Implement for near and far phase.
8-
-- TODO: DX10: Setup samplers.
9-
-- shader:sampler ("s_smap") :texture ("null")
10-
-- shader:sampler ("s_position") :texture ("$user$position")
11-
-- shader:sampler ("jitter0") :texture ("$user$jitter_0") : f_none ()
12-
13-
shader:dx10texture ("s_smap", "null")
14-
shader:dx10texture ("s_position", "$user$position")
15-
shader:dx10texture ("jitter0", "$user$jitter_0")
16-
17-
shader:dx10sampler ("smp_nofilter")
18-
shader:dx10sampler ("smp_jitter")
19-
shader:dx10sampler ("smp_smap")
8+
shader:sampler ("s_smap") :texture ("$user$smap_depth") : comp_less ()
9+
shader:sampler ("s_position") :texture ("$user$position")
10+
shader:sampler ("jitter0") :texture ("$user$jitter_0") : f_none ()
2011
end

‎res/gamedata/shaders/gl/accum_volumetric_sun_msaa4.s‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,7 @@ function normal (shader, t_base, t_second, t_detail)
55
: blend (true,blend.one,blend.one)
66
: sorting (2, false)
77
-- TODO: DX10: Implement for near and far phase.
8-
-- TODO: DX10: Setup samplers.
9-
-- shader:sampler ("s_smap") :texture ("null")
10-
-- shader:sampler ("s_position") :texture ("$user$position")
11-
-- shader:sampler ("jitter0") :texture ("$user$jitter_0") : f_none ()
12-
13-
shader:dx10texture ("s_smap", "null")
14-
shader:dx10texture ("s_position", "$user$position")
15-
shader:dx10texture ("jitter0", "$user$jitter_0")
16-
17-
shader:dx10sampler ("smp_nofilter")
18-
shader:dx10sampler ("smp_jitter")
19-
shader:dx10sampler ("smp_smap")
8+
shader:sampler ("s_smap") :texture ("$user$smap_depth") : comp_less ()
9+
shader:sampler ("s_position") :texture ("$user$position")
10+
shader:sampler ("jitter0") :texture ("$user$jitter_0") : f_none ()
2011
end

‎res/gamedata/shaders/gl/accum_volumetric_sun_msaa5.s‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,7 @@ function normal (shader, t_base, t_second, t_detail)
55
: blend (true,blend.one,blend.one)
66
: sorting (2, false)
77
-- TODO: DX10: Implement for near and far phase.
8-
-- TODO: DX10: Setup samplers.
9-
-- shader:sampler ("s_smap") :texture ("null")
10-
-- shader:sampler ("s_position") :texture ("$user$position")
11-
-- shader:sampler ("jitter0") :texture ("$user$jitter_0") : f_none ()
12-
13-
shader:dx10texture ("s_smap", "null")
14-
shader:dx10texture ("s_position", "$user$position")
15-
shader:dx10texture ("jitter0", "$user$jitter_0")
16-
17-
shader:dx10sampler ("smp_nofilter")
18-
shader:dx10sampler ("smp_jitter")
19-
shader:dx10sampler ("smp_smap")
8+
shader:sampler ("s_smap") :texture ("$user$smap_depth") : comp_less ()
9+
shader:sampler ("s_position") :texture ("$user$position")
10+
shader:sampler ("jitter0") :texture ("$user$jitter_0") : f_none ()
2011
end

0 commit comments

Comments
 (0)