diff options
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_link.cpp | 10 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_program.c | 1 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_link.cpp b/src/mesa/drivers/dri/i965/brw_link.cpp index 0723255dec6..2cbb1e0b879 100644 --- a/src/mesa/drivers/dri/i965/brw_link.cpp +++ b/src/mesa/drivers/dri/i965/brw_link.cpp @@ -270,6 +270,16 @@ brw_link_shader(struct gl_context *ctx, struct gl_shader_program *shProg) gl_nir_link_assign_xfb_resources(ctx, shProg); } + for (stage = 0; stage < ARRAY_SIZE(shProg->_LinkedShaders); stage++) { + struct gl_linked_shader *shader = shProg->_LinkedShaders[stage]; + if (!shader) + continue; + + struct gl_program *prog = shader->Program; + + NIR_PASS_V(prog->nir, brw_nir_lower_gl_images, prog); + } + /* Determine first and last stage. */ unsigned first = MESA_SHADER_STAGES; unsigned last = 0; diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c index ba418e45b85..f5ebd3c3b05 100644 --- a/src/mesa/drivers/dri/i965/brw_program.c +++ b/src/mesa/drivers/dri/i965/brw_program.c @@ -140,7 +140,6 @@ brw_create_nir(struct brw_context *brw, } NIR_PASS_V(nir, brw_nir_lower_uniforms, is_scalar); - NIR_PASS_V(nir, brw_nir_lower_gl_images, prog); return nir; } |