shaders: Edit blender scripts to use OpenGL samplers.

res/gamedata/shaders/gl/accum_volumetric.s

@@ -5,17 +5,7 @@ function normal (shader, t_base, t_second, t_detail)
  : blend (true,blend.one,blend.one)
 -- : aref (true,0)
  : sorting (2, false)
--- TODO: Implement sampler states
--- shader:sampler ("s_lmap") :texture (t_base): clamp()
--- shader:sampler ("s_smap") :texture ("null")
--- shader:sampler ("s_noise") :texture("fx\\fx_noise") : f_linear ()
-
- shader:dx10texture ("s_lmap", t_base) 
- shader:dx10texture ("s_smap", "null")
- shader:dx10texture ("s_noise", "fx\\fx_noise")
-
- shader:dx10sampler ("smp_rtlinear")
- shader:dx10sampler ("smp_linear")
--- shader:dx10sampler ("smp_jitter")
- shader:dx10sampler ("smp_smap")
+ shader:sampler ("s_lmap") :texture (t_base): clamp()
+ shader:sampler ("s_smap") :texture ("$user$smap_depth") : comp_less ()
+ shader:sampler ("s_noise") :texture ("fx\\fx_noise") : f_linear ()
 end

res/gamedata/shaders/gl/accum_volumetric_nomsaa.s

@@ -5,17 +5,7 @@ function normal (shader, t_base, t_second, t_detail)
  : blend (true,blend.one,blend.one)
 -- : aref (true,0)
  : sorting (2, false)
--- TODO: Implement sampler states
--- shader:sampler ("s_lmap") :texture (t_base): clamp()
--- shader:sampler ("s_smap") :texture ("null")
--- shader:sampler ("s_noise") :texture("fx\\fx_noise") : f_linear ()
-
- shader:dx10texture ("s_lmap", t_base) 
- shader:dx10texture ("s_smap", "null")
- shader:dx10texture ("s_noise", "fx\\fx_noise")
-
- shader:dx10sampler ("smp_rtlinear")
- shader:dx10sampler ("smp_linear")
--- shader:dx10sampler ("smp_jitter")
- shader:dx10sampler ("smp_smap")
+ shader:sampler ("s_lmap") :texture (t_base): clamp()
+ shader:sampler ("s_smap") :texture ("$user$smap_depth") : comp_less ()
+ shader:sampler ("s_noise") :texture ("fx\\fx_noise") : f_linear ()
 end

res/gamedata/shaders/gl/accum_volumetric_sun.s

@@ -5,17 +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.
--- TODO: DX10: Setup samplers.
--- shader:sampler ("s_smap") :texture ("null")
--- shader:sampler ("s_position") :texture ("$user$position")
--- shader:sampler ("jitter0") :texture ("$user$jitter_0") : f_none ()
-
- shader:dx10texture ("s_smap", "null")
- shader:dx10texture ("s_smap_minmax", "$user$smap_depth_minmax");
- shader:dx10texture ("s_position", "$user$position")
- shader:dx10texture ("jitter0", "$user$jitter_0")
-
- shader:dx10sampler ("smp_nofilter")
- shader:dx10sampler ("smp_jitter")
- shader:dx10sampler ("smp_smap")
+ 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 ()
 end

res/gamedata/shaders/gl/accum_volumetric_sun_minmax.s

@@ -5,17 +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.
--- TODO: DX10: Setup samplers.
--- shader:sampler ("s_smap") :texture ("null")
--- shader:sampler ("s_position") :texture ("$user$position")
--- shader:sampler ("jitter0") :texture ("$user$jitter_0") : f_none ()
-
- shader:dx10texture ("s_smap", "null")
- shader:dx10texture ("s_smap_minmax", "$user$smap_depth_minmax");
- shader:dx10texture ("s_position", "$user$position")
- shader:dx10texture ("jitter0", "$user$jitter_0")
-
- shader:dx10sampler ("smp_nofilter")
- shader:dx10sampler ("smp_jitter")
- shader:dx10sampler ("smp_smap")
+ 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 ()
 end

res/gamedata/shaders/gl/accum_volumetric_sun_msaa0.s

@@ -5,16 +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.
--- TODO: DX10: Setup samplers.
--- shader:sampler ("s_smap") :texture ("null")
--- shader:sampler ("s_position") :texture ("$user$position")
--- shader:sampler ("jitter0") :texture ("$user$jitter_0") : f_none ()
-
- shader:dx10texture ("s_smap", "null")
- shader:dx10texture ("s_position", "$user$position")
- shader:dx10texture ("jitter0", "$user$jitter_0")
-
- shader:dx10sampler ("smp_nofilter")
- shader:dx10sampler ("smp_jitter")
- shader:dx10sampler ("smp_smap")
+ 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 ()
 end

res/gamedata/shaders/gl/accum_volumetric_sun_msaa1.s

@@ -5,16 +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.
--- TODO: DX10: Setup samplers.
--- shader:sampler ("s_smap") :texture ("null")
--- shader:sampler ("s_position") :texture ("$user$position")
--- shader:sampler ("jitter0") :texture ("$user$jitter_0") : f_none ()
-
- shader:dx10texture ("s_smap", "null")
- shader:dx10texture ("s_position", "$user$position")
- shader:dx10texture ("jitter0", "$user$jitter_0")
-
- shader:dx10sampler ("smp_nofilter")
- shader:dx10sampler ("smp_jitter")
- shader:dx10sampler ("smp_smap")
+ 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 ()
 end

res/gamedata/shaders/gl/accum_volumetric_sun_msaa2.s

@@ -5,16 +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.
--- TODO: DX10: Setup samplers.
--- shader:sampler ("s_smap") :texture ("null")
--- shader:sampler ("s_position") :texture ("$user$position")
--- shader:sampler ("jitter0") :texture ("$user$jitter_0") : f_none ()
-
- shader:dx10texture ("s_smap", "null")
- shader:dx10texture ("s_position", "$user$position")
- shader:dx10texture ("jitter0", "$user$jitter_0")
-
- shader:dx10sampler ("smp_nofilter")
- shader:dx10sampler ("smp_jitter")
- shader:dx10sampler ("smp_smap")
+ 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 ()
 end

res/gamedata/shaders/gl/accum_volumetric_sun_msaa3.s

@@ -5,16 +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.
--- TODO: DX10: Setup samplers.
--- shader:sampler ("s_smap") :texture ("null")
--- shader:sampler ("s_position") :texture ("$user$position")
--- shader:sampler ("jitter0") :texture ("$user$jitter_0") : f_none ()
-
- shader:dx10texture ("s_smap", "null")
- shader:dx10texture ("s_position", "$user$position")
- shader:dx10texture ("jitter0", "$user$jitter_0")
-
- shader:dx10sampler ("smp_nofilter")
- shader:dx10sampler ("smp_jitter")
- shader:dx10sampler ("smp_smap")
+ 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 ()
 end

res/gamedata/shaders/gl/accum_volumetric_sun_msaa4.s

@@ -5,16 +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.
--- TODO: DX10: Setup samplers.
--- shader:sampler ("s_smap") :texture ("null")
--- shader:sampler ("s_position") :texture ("$user$position")
--- shader:sampler ("jitter0") :texture ("$user$jitter_0") : f_none ()
-
- shader:dx10texture ("s_smap", "null")
- shader:dx10texture ("s_position", "$user$position")
- shader:dx10texture ("jitter0", "$user$jitter_0")
-
- shader:dx10sampler ("smp_nofilter")
- shader:dx10sampler ("smp_jitter")
- shader:dx10sampler ("smp_smap")
+ 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 ()
 end

res/gamedata/shaders/gl/accum_volumetric_sun_msaa5.s

@@ -5,16 +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.
--- TODO: DX10: Setup samplers.
--- shader:sampler ("s_smap") :texture ("null")
--- shader:sampler ("s_position") :texture ("$user$position")
--- shader:sampler ("jitter0") :texture ("$user$jitter_0") : f_none ()
-
- shader:dx10texture ("s_smap", "null")
- shader:dx10texture ("s_position", "$user$position")
- shader:dx10texture ("jitter0", "$user$jitter_0")
-
- shader:dx10sampler ("smp_nofilter")
- shader:dx10sampler ("smp_jitter")
- shader:dx10sampler ("smp_smap")
+ 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 ()
 end

res/gamedata/shaders/gl/accum_volumetric_sun_msaa6.s

@@ -5,16 +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.
--- TODO: DX10: Setup samplers.
--- shader:sampler ("s_smap") :texture ("null")
--- shader:sampler ("s_position") :texture ("$user$position")
--- shader:sampler ("jitter0") :texture ("$user$jitter_0") : f_none ()
-
- shader:dx10texture ("s_smap", "null")
- shader:dx10texture ("s_position", "$user$position")
- shader:dx10texture ("jitter0", "$user$jitter_0")
-
- shader:dx10sampler ("smp_nofilter")
- shader:dx10sampler ("smp_jitter")
- shader:dx10sampler ("smp_smap")
+ 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 ()
 end

res/gamedata/shaders/gl/accum_volumetric_sun_msaa7.s

@@ -5,16 +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.
--- TODO: DX10: Setup samplers.
--- shader:sampler ("s_smap") :texture ("null")
--- shader:sampler ("s_position") :texture ("$user$position")
--- shader:sampler ("jitter0") :texture ("$user$jitter_0") : f_none ()
-
- shader:dx10texture ("s_smap", "null")
- shader:dx10texture ("s_position", "$user$position")
- shader:dx10texture ("jitter0", "$user$jitter_0")
-
- shader:dx10sampler ("smp_nofilter")
- shader:dx10sampler ("smp_jitter")
- shader:dx10sampler ("smp_smap")
+ 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 ()
 end

res/gamedata/shaders/gl/accum_volumetric_sun_nomsaa.s

@@ -5,17 +5,8 @@ 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.
--- TODO: DX10: Setup samplers.
--- shader:sampler ("s_smap") :texture ("null")
--- shader:sampler ("s_position") :texture ("$user$position")
--- shader:sampler ("jitter0") :texture ("$user$jitter_0") : f_none ()
-
- shader:dx10texture ("s_smap", "null")
- shader:dx10texture ("s_smap_minmax", "$user$smap_depth_minmax");
- shader:dx10texture ("s_position", "$user$position")
- shader:dx10texture ("jitter0", "$user$jitter_0")
-
- shader:dx10sampler ("smp_nofilter")
- shader:dx10sampler ("smp_jitter")
- shader:dx10sampler ("smp_smap")
+ 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_position") :texture ("$user$position")
+ shader:sampler ("jitter0") :texture ("$user$jitter_0") : f_none ()
 end

res/gamedata/shaders/gl/accum_volumetric_sun_nomsaa_minmax.s

@@ -5,17 +5,8 @@ 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.
--- TODO: DX10: Setup samplers.
--- shader:sampler ("s_smap") :texture ("null")
--- shader:sampler ("s_position") :texture ("$user$position")
--- shader:sampler ("jitter0") :texture ("$user$jitter_0") : f_none ()
-
- shader:dx10texture ("s_smap", "null")
- shader:dx10texture ("s_smap_minmax", "$user$smap_depth_minmax");
- shader:dx10texture ("s_position", "$user$position")
- shader:dx10texture ("jitter0", "$user$jitter_0")
-
- shader:dx10sampler ("smp_nofilter")
- shader:dx10sampler ("smp_jitter")
- shader:dx10sampler ("smp_smap")
+ 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_position") :texture ("$user$position")
+ shader:sampler ("jitter0") :texture ("$user$jitter_0") : f_none ()
 end

res/gamedata/shaders/gl/clouds.s

@@ -6,16 +6,7 @@ function normal (shader, t_base, t_second, t_detail)
  : zb (false,false)
  : sorting (3, true)
  : blend (true, blend.srcalpha,blend.invsrcalpha)
-
--- TODO: DX10: implement sampler setup
--- shader:sampler ("s_clouds0") :texture ("null") : wrap() : f_anisotropic()
--- shader:sampler ("s_clouds1") :texture ("null") : wrap() : f_anisotropic()
--- shader:sampler ("s_tonemap") :texture ("$user$tonemap")
-
- shader:dx10texture ("s_clouds0", "null")
- shader:dx10texture ("s_clouds1", "null")
- shader:dx10texture ("s_tonemap", "$user$tonemap")
-
- shader:dx10sampler ("smp_base")
--- shader:dx10sampler ("smp_linear")
+ shader:sampler ("s_clouds0") :texture ("null") : wrap() : f_anisotropic()
+ shader:sampler ("s_clouds1") :texture ("null") : wrap() : f_anisotropic()
+ shader:sampler ("s_tonemap") :texture ("$user$tonemap")
 end

res/gamedata/shaders/gl/combine_volumetric.s

@@ -5,12 +5,6 @@ function normal (shader, t_base, t_second, t_detail)
  : blend (true,blend.one,blend.one)
 -- : aref (true,0) -- enable to save bandwith?
  : sorting (2, false)
--- TOD0: DX10: Implement samplers
--- shader:sampler ("s_vollight") :texture ("$user$generic2")
--- shader:sampler ("s_tonemap") :texture ("$user$tonemap")
-
- shader:dx10texture ("s_vollight", "$user$generic2")
- shader:dx10texture ("s_tonemap", "$user$tonemap")
-
- shader:dx10sampler ("smp_nofilter")
+ shader:sampler ("s_vollight") :texture ("$user$generic2")
+ shader:sampler ("s_tonemap") :texture ("$user$tonemap")
 end

res/gamedata/shaders/gl/details_lod.s

@@ -8,11 +8,8 @@ function pass_setup_common (shader, t_base, t_second, t_detail)
  stencil_op.keep, stencil_op.replace, stencil_op.keep)
  :dx10stencil_ref (1)
 
- shader:dx10texture ("s_base", t_base)
- shader:dx10texture ("s_hemi", t_base .. "_nm")
-
- shader:dx10sampler ("smp_base");
- shader:dx10sampler ("smp_linear");
+ shader:sampler ("s_base") :texture (t_base)
+ shader:sampler ("s_hemi") :texture (t_base .. "_nm")
 end
 
 function l_special (shader, t_base, t_second, t_detail)
@@ -48,12 +45,7 @@ function l_special (shader, t_base, t_second, t_detail)
  stencil_op.keep, stencil_op.replace, stencil_op.keep)
 
  shader:dx10stencil_ref (1)
--- shader:sampler ("s_base") :texture (t_base)
--- shader:sampler ("s_hemi") :texture (t_base .. "_nm")
- shader:dx10texture ("s_base", t_base)
- shader:dx10texture ("s_hemi", t_base .. "_nm")
-
- shader:dx10sampler ("smp_base");
- shader:dx10sampler ("smp_linear");
+ shader:sampler ("s_base") :texture (t_base)
+ shader:sampler ("s_hemi") :texture (t_base .. "_nm")
 end
 ]]--

res/gamedata/shaders/gl/distort.s

@@ -2,12 +2,6 @@ function normal (shader, t_base, t_second, t_detail)
  shader:begin ("stub_notransform_t","distort")
  : fog (false)
  : zb (false,false)
--- TODO: DX10: Implement samplers
--- shader:sampler ("s_base") :texture("$user$generic0") : clamp() : f_linear ()
--- shader:sampler ("s_distort") :texture("$user$generic1") : clamp() : f_linear ()
-
- shader:dx10texture ("s_base", "$user$generic0")
- shader:dx10texture ("s_distort", "$user$generic1")
-
- shader:dx10sampler ("smp_rtlinear");
+ shader:sampler ("s_base") :texture("$user$generic0") : clamp() : f_linear ()
+ shader:sampler ("s_distort") :texture("$user$generic1") : clamp() : f_linear ()
 end

res/gamedata/shaders/gl/effects_bullet_tracer.s

@@ -4,10 +4,5 @@ function normal (shader, t_base, t_second, t_detail)
  :blend(true, blend.one, blend.one)
 -- :blend(true, blend.srcalpha, blend.one)
 -- :aref(true, 32)
-
--- Decouple sampler and texture
--- shader:sampler ("s_base") : texture(t_base) : clamp() : f_linear ()
--- TODO: DX10: move stub_default to smp_rtlinear
- shader:dx10texture ("s_base", t_base)
- shader:dx10sampler ("smp_base")
+ shader:sampler ("s_base") : texture(t_base) : clamp() : f_linear ()
 end