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

‎res/gamedata/shaders/gl/accum_volumetric_sun_msaa6.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_msaa7.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_nomsaa.s

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,8 @@ 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_smap_minmax") :texture ("$user$smap_depth_minmax") : comp_less ()
10+
shader:sampler ("s_position") :texture ("$user$position")
11+
shader:sampler ("jitter0") :texture ("$user$jitter_0") : f_none ()
2112
end

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

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,8 @@ 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_smap_minmax") :texture ("$user$smap_depth_minmax") : comp_less ()
10+
shader:sampler ("s_position") :texture ("$user$position")
11+
shader:sampler ("jitter0") :texture ("$user$jitter_0") : f_none ()
2112
end

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

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,7 @@ function normal (shader, t_base, t_second, t_detail)
66
: zb (false,false)
77
: sorting (3, true)
88
: blend (true, blend.srcalpha,blend.invsrcalpha)
9-
10-
-- TODO: DX10: implement sampler setup
11-
-- shader:sampler ("s_clouds0") :texture ("null") : wrap() : f_anisotropic()
12-
-- shader:sampler ("s_clouds1") :texture ("null") : wrap() : f_anisotropic()
13-
-- shader:sampler ("s_tonemap") :texture ("$user$tonemap")
14-
15-
shader:dx10texture ("s_clouds0", "null")
16-
shader:dx10texture ("s_clouds1", "null")
17-
shader:dx10texture ("s_tonemap", "$user$tonemap")
18-
19-
shader:dx10sampler ("smp_base")
20-
-- shader:dx10sampler ("smp_linear")
9+
shader:sampler ("s_clouds0") :texture ("null") : wrap() : f_anisotropic()
10+
shader:sampler ("s_clouds1") :texture ("null") : wrap() : f_anisotropic()
11+
shader:sampler ("s_tonemap") :texture ("$user$tonemap")
2112
end

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@ function normal (shader, t_base, t_second, t_detail)
55
: blend (true,blend.one,blend.one)
66
-- : aref (true,0) -- enable to save bandwith?
77
: sorting (2, false)
8-
-- TOD0: DX10: Implement samplers
9-
-- shader:sampler ("s_vollight") :texture ("$user$generic2")
10-
-- shader:sampler ("s_tonemap") :texture ("$user$tonemap")
11-
12-
shader:dx10texture ("s_vollight", "$user$generic2")
13-
shader:dx10texture ("s_tonemap", "$user$tonemap")
14-
15-
shader:dx10sampler ("smp_nofilter")
8+
shader:sampler ("s_vollight") :texture ("$user$generic2")
9+
shader:sampler ("s_tonemap") :texture ("$user$tonemap")
1610
end

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

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,8 @@ function pass_setup_common (shader, t_base, t_second, t_detail)
88
stencil_op.keep, stencil_op.replace, stencil_op.keep)
99
:dx10stencil_ref (1)
1010

11-
shader:dx10texture ("s_base", t_base)
12-
shader:dx10texture ("s_hemi", t_base .. "_nm")
13-
14-
shader:dx10sampler ("smp_base");
15-
shader:dx10sampler ("smp_linear");
11+
shader:sampler ("s_base") :texture (t_base)
12+
shader:sampler ("s_hemi") :texture (t_base .. "_nm")
1613
end
1714

1815
function l_special (shader, t_base, t_second, t_detail)
@@ -48,12 +45,7 @@ function l_special (shader, t_base, t_second, t_detail)
4845
stencil_op.keep, stencil_op.replace, stencil_op.keep)
4946

5047
shader:dx10stencil_ref (1)
51-
-- shader:sampler ("s_base") :texture (t_base)
52-
-- shader:sampler ("s_hemi") :texture (t_base .. "_nm")
53-
shader:dx10texture ("s_base", t_base)
54-
shader:dx10texture ("s_hemi", t_base .. "_nm")
55-
56-
shader:dx10sampler ("smp_base");
57-
shader:dx10sampler ("smp_linear");
48+
shader:sampler ("s_base") :texture (t_base)
49+
shader:sampler ("s_hemi") :texture (t_base .. "_nm")
5850
end
5951
]]--

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,6 @@ function normal (shader, t_base, t_second, t_detail)
22
shader:begin ("stub_notransform_t","distort")
33
: fog (false)
44
: zb (false,false)
5-
-- TODO: DX10: Implement samplers
6-
-- shader:sampler ("s_base") :texture("$user$generic0") : clamp() : f_linear ()
7-
-- shader:sampler ("s_distort") :texture("$user$generic1") : clamp() : f_linear ()
8-
9-
shader:dx10texture ("s_base", "$user$generic0")
10-
shader:dx10texture ("s_distort", "$user$generic1")
11-
12-
shader:dx10sampler ("smp_rtlinear");
5+
shader:sampler ("s_base") :texture("$user$generic0") : clamp() : f_linear ()
6+
shader:sampler ("s_distort") :texture("$user$generic1") : clamp() : f_linear ()
137
end

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,5 @@ function normal (shader, t_base, t_second, t_detail)
44
:blend(true, blend.one, blend.one)
55
-- :blend(true, blend.srcalpha, blend.one)
66
-- :aref(true, 32)
7-
8-
-- Decouple sampler and texture
9-
-- shader:sampler ("s_base") : texture(t_base) : clamp() : f_linear ()
10-
-- TODO: DX10: move stub_default to smp_rtlinear
11-
shader:dx10texture ("s_base", t_base)
12-
shader:dx10sampler ("smp_base")
7+
shader:sampler ("s_base") : texture(t_base) : clamp() : f_linear ()
138
end

0 commit comments

Comments
 (0)