diff --git a/.pick_status.json b/.pick_status.json index 65565d55ebe..edd8863022e 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -121,7 +121,7 @@ "description": "mesa/program: fix shadow property for samplers", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "1c0f92d8a8c480a5803c3ce45b2a6d46bfcd280f" }, diff --git a/src/mesa/program/prog_to_nir.c b/src/mesa/program/prog_to_nir.c index 31ad0cb58c5..2948206ef6a 100644 --- a/src/mesa/program/prog_to_nir.c +++ b/src/mesa/program/prog_to_nir.c @@ -540,7 +540,7 @@ ptn_tex(struct ptn_compile *c, nir_alu_dest dest, nir_ssa_def **src, nir_variable *var = c->sampler_vars[prog_inst->TexSrcUnit]; if (!var) { const struct glsl_type *type = - glsl_sampler_type(instr->sampler_dim, false, false, GLSL_TYPE_FLOAT); + glsl_sampler_type(instr->sampler_dim, instr->is_shadow, false, GLSL_TYPE_FLOAT); var = nir_variable_create(b->shader, nir_var_uniform, type, "sampler"); var->data.binding = prog_inst->TexSrcUnit; var->data.explicit_binding = true;