From: Kenneth Graunke <kenneth@whitecape.org>
Date: Wed, 6 Feb 2019 08:06:33 +0000 (-0800)
Subject: st/nir: Lower sampler derefs for builtin shaders.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ba9c1c8217d504b0dbcb1b7f6f3e62d04633c2aa;p=mesa.git

st/nir: Lower sampler derefs for builtin shaders.

Reviewed-by: Eric Anholt <eric@anholt.net>
---

diff --git a/src/mesa/state_tracker/st_nir_builtins.c b/src/mesa/state_tracker/st_nir_builtins.c
index 7574ce306d5..18dc2095d6f 100644
--- a/src/mesa/state_tracker/st_nir_builtins.c
+++ b/src/mesa/state_tracker/st_nir_builtins.c
@@ -61,6 +61,8 @@ st_nir_finish_builtin_shader(struct st_context *st,
 
    st_nir_assign_varying_locations(st, nir);
 
+   st_nir_lower_samplers(screen, nir, NULL);
+
    if (st->ctx->Const.PackedDriverUniformStorage) {
       NIR_PASS_V(nir, nir_lower_io, nir_var_uniform, st_glsl_type_dword_size,
                  (nir_lower_io_options)0);