From 243c11dc1687b1f3adf0c96dd174803885704c48 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Tue, 5 Feb 2019 19:15:46 -0800 Subject: [PATCH] i965: Call nir_lower_samplers for ARB programs. An upcoming patch will start building derefs in prog_to_nir, at which point we'll need to lower them to indexes. This gets both GLSL and non-GLSL shaders using the same paths. Reviewed-by: Eric Anholt --- src/mesa/drivers/dri/i965/brw_program.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c index 1038d9a47a0..5dedca5a719 100644 --- a/src/mesa/drivers/dri/i965/brw_program.c +++ b/src/mesa/drivers/dri/i965/brw_program.c @@ -41,6 +41,7 @@ #include "util/ralloc.h" #include "compiler/glsl/ir.h" #include "compiler/glsl/program.h" +#include "compiler/glsl/gl_nir.h" #include "compiler/glsl/glsl_to_nir.h" #include "glsl/float64_glsl.h" @@ -151,6 +152,7 @@ brw_create_nir(struct brw_context *brw, } else { nir = prog_to_nir(prog, options); NIR_PASS_V(nir, nir_lower_regs_to_ssa); /* turn registers into SSA */ + NIR_PASS_V(nir, gl_nir_lower_samplers, NULL); } nir_validate_shader(nir, "before brw_preprocess_nir"); -- 2.30.2