diff options
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_link.cpp | 8 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_program.c | 30 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_program.h | 5 |
3 files changed, 33 insertions, 10 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_link.cpp b/src/mesa/drivers/dri/i965/brw_link.cpp index 61d317350b4..8d718f33b3a 100644 --- a/src/mesa/drivers/dri/i965/brw_link.cpp +++ b/src/mesa/drivers/dri/i965/brw_link.cpp @@ -261,6 +261,12 @@ brw_link_shader(struct gl_context *ctx, struct gl_shader_program *shProg) compiler->scalar_stage[stage]); } + /* TODO: Verify if its feasible to split up the NIR linking work into a + * per-stage part (that fill out information we need for the passes) and a + * actual linking part, so that we could fold back brw_nir_lower_resources + * back into brw_create_nir. + */ + /* SPIR-V programs use a NIR linker */ if (shProg->data->spirv) { if (!gl_nir_link_uniforms(ctx, shProg)) @@ -277,6 +283,8 @@ brw_link_shader(struct gl_context *ctx, struct gl_shader_program *shProg) struct gl_program *prog = shader->Program; + brw_nir_lower_resources(prog->nir, shProg, prog, &brw->screen->devinfo); + NIR_PASS_V(prog->nir, brw_nir_lower_gl_images, prog); } diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c index 87d6bbadb28..aa7961ff196 100644 --- a/src/mesa/drivers/dri/i965/brw_program.c +++ b/src/mesa/drivers/dri/i965/brw_program.c @@ -119,16 +119,6 @@ brw_create_nir(struct brw_context *brw, brw_preprocess_nir(brw->screen->compiler, nir, softfp64); - NIR_PASS_V(nir, gl_nir_lower_samplers, shader_prog); - prog->info.textures_used = nir->info.textures_used; - prog->info.textures_used_by_txf = nir->info.textures_used_by_txf; - - NIR_PASS_V(nir, brw_nir_lower_image_load_store, devinfo); - - NIR_PASS_V(nir, gl_nir_lower_buffers, shader_prog); - /* Do a round of constant folding to clean up address calculations */ - NIR_PASS_V(nir, nir_opt_constant_folding); - if (stage == MESA_SHADER_TESS_CTRL) { /* Lower gl_PatchVerticesIn from a sys. value to a uniform on Gen8+. */ static const gl_state_index16 tokens[STATE_LENGTH] = @@ -170,6 +160,22 @@ brw_create_nir(struct brw_context *brw, } void +brw_nir_lower_resources(nir_shader *nir, struct gl_shader_program *shader_prog, + struct gl_program *prog, + const struct gen_device_info *devinfo) +{ + NIR_PASS_V(prog->nir, gl_nir_lower_samplers, shader_prog); + prog->info.textures_used = prog->nir->info.textures_used; + prog->info.textures_used_by_txf = prog->nir->info.textures_used_by_txf; + + NIR_PASS_V(prog->nir, brw_nir_lower_image_load_store, devinfo); + + NIR_PASS_V(prog->nir, gl_nir_lower_buffers, shader_prog); + /* Do a round of constant folding to clean up address calculations */ + NIR_PASS_V(prog->nir, nir_opt_constant_folding); +} + +void brw_shader_gather_info(nir_shader *nir, struct gl_program *prog) { nir_shader_gather_info(nir, nir_shader_get_entrypoint(nir)); @@ -262,6 +268,8 @@ brwProgramStringNotify(struct gl_context *ctx, prog->nir = brw_create_nir(brw, NULL, prog, MESA_SHADER_FRAGMENT, true); + brw_nir_lower_resources(prog->nir, NULL, prog, &brw->screen->devinfo); + brw_shader_gather_info(prog->nir, prog); brw_fs_precompile(ctx, prog); @@ -286,6 +294,8 @@ brwProgramStringNotify(struct gl_context *ctx, prog->nir = brw_create_nir(brw, NULL, prog, MESA_SHADER_VERTEX, compiler->scalar_stage[MESA_SHADER_VERTEX]); + brw_nir_lower_resources(prog->nir, NULL, prog, &brw->screen->devinfo); + brw_shader_gather_info(prog->nir, prog); brw_vs_precompile(ctx, prog); diff --git a/src/mesa/drivers/dri/i965/brw_program.h b/src/mesa/drivers/dri/i965/brw_program.h index 8eb9620ab1e..9227329758a 100644 --- a/src/mesa/drivers/dri/i965/brw_program.h +++ b/src/mesa/drivers/dri/i965/brw_program.h @@ -64,6 +64,11 @@ struct nir_shader *brw_create_nir(struct brw_context *brw, gl_shader_stage stage, bool is_scalar); +void brw_nir_lower_resources(nir_shader *nir, + struct gl_shader_program *shader_prog, + struct gl_program *prog, + const struct gen_device_info *devinfo); + void brw_shader_gather_info(nir_shader *nir, struct gl_program *prog); void brw_setup_tex_for_precompile(const struct gen_device_info *devinfo, |