From 6487e7a30c9e4c2a417ddfe632d5f68e065e21eb Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Mon, 30 Apr 2018 20:39:43 +1000 Subject: nir: move GL specific passes to src/compiler/glsl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With this we should have no passes in src/compiler/nir with any dependencies on headers from core GL Mesa. Reviewed-by: Alejandro Piñeiro --- src/mesa/drivers/dri/i965/brw_link.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/mesa/drivers/dri') diff --git a/src/mesa/drivers/dri/i965/brw_link.cpp b/src/mesa/drivers/dri/i965/brw_link.cpp index 7841626dc33..39fa94c0f8d 100644 --- a/src/mesa/drivers/dri/i965/brw_link.cpp +++ b/src/mesa/drivers/dri/i965/brw_link.cpp @@ -24,6 +24,7 @@ #include "brw_context.h" #include "compiler/brw_nir.h" #include "brw_program.h" +#include "compiler/glsl/gl_nir.h" #include "compiler/glsl/ir.h" #include "compiler/glsl/ir_optimization.h" #include "compiler/glsl/program.h" @@ -299,8 +300,8 @@ brw_link_shader(struct gl_context *ctx, struct gl_shader_program *shProg) struct gl_program *prog = shader->Program; brw_shader_gather_info(prog->nir, prog); - NIR_PASS_V(prog->nir, nir_lower_samplers, shProg); - NIR_PASS_V(prog->nir, nir_lower_atomics, shProg, false); + NIR_PASS_V(prog->nir, gl_nir_lower_samplers, shProg); + NIR_PASS_V(prog->nir, gl_nir_lower_atomics, shProg, false); NIR_PASS_V(prog->nir, nir_lower_atomics_to_ssbo, prog->nir->info.num_abos); -- cgit v1.2.3