Fixes: 856e8408 ("mesa/st: add sampler uniforms")
Replaces !1388 (closed)
AppVeyor results
/cc @krzysztof.raszkowski @robclark @anholt