glsl: Hard-code noise to zero in builtin_functions.cpp

[mesa.git] / src / mesa / drivers / dri / i965 / brw_link.cpp

diff --git a/src/mesa/drivers/dri/i965/brw_link.cpp b/src/mesa/drivers/dri/i965/brw_link.cpp
index c77b696e6a7051c6deaa55b6f366be74c56292aa..cfd56cef0df34201a5773d2bbbefce8adf15e766 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_link.cpp
+++ b/src/mesa/drivers/dri/i965/brw_link.cpp
@@ -135,7 +135,6 @@ process_glsl_ir(struct brw_context *brw,
    do_vec_index_to_cond_assign(shader->ir);
    lower_vector_insert(shader->ir, true);
    lower_offset_arrays(shader->ir);
-   lower_noise(shader->ir);
    lower_quadop_vector(shader->ir, false);
 
    validate_ir_tree(shader->ir);
@@ -272,7 +271,7 @@ brw_link_shader(struct gl_context *ctx, struct gl_shader_program *shProg)
       static const gl_nir_linker_options opts = {
          .fill_parameters = false,
       };
-      if (!gl_nir_link(ctx, shProg, &opts))
+      if (!gl_nir_link_spirv(ctx, shProg, &opts))
          return GL_FALSE;
    }
 
@@ -332,8 +331,7 @@ brw_link_shader(struct gl_context *ctx, struct gl_shader_program *shProg)
       brw_shader_gather_info(prog->nir, prog);
 
       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);
+      NIR_PASS_V(prog->nir, nir_lower_atomics_to_ssbo);
 
       nir_sweep(prog->nir);