diff options
Diffstat (limited to 'src/intel/compiler')
| -rw-r--r-- | src/intel/compiler/brw_nir.h | 5 | ||||
| -rw-r--r-- | src/intel/compiler/brw_vec4.cpp | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/intel/compiler/brw_nir.h b/src/intel/compiler/brw_nir.h index 6f64a731cac..1493b742e42 100644 --- a/src/intel/compiler/brw_nir.h +++ b/src/intel/compiler/brw_nir.h @@ -134,12 +134,13 @@ enum brw_reg_type brw_type_for_nir_type(const struct gen_device_info *devinfo, enum glsl_base_type brw_glsl_base_type_for_nir_type(nir_alu_type type); -void brw_nir_setup_glsl_uniforms(nir_shader *shader, +void brw_nir_setup_glsl_uniforms(void *mem_ctx, nir_shader *shader, const struct gl_program *prog, struct brw_stage_prog_data *stage_prog_data, bool is_scalar); -void brw_nir_setup_arb_uniforms(nir_shader *shader, struct gl_program *prog, +void brw_nir_setup_arb_uniforms(void *mem_ctx, nir_shader *shader, + struct gl_program *prog, struct brw_stage_prog_data *stage_prog_data); void brw_nir_analyze_ubo_ranges(const struct brw_compiler *compiler, diff --git a/src/intel/compiler/brw_vec4.cpp b/src/intel/compiler/brw_vec4.cpp index 8614886967c..04304fcb457 100644 --- a/src/intel/compiler/brw_vec4.cpp +++ b/src/intel/compiler/brw_vec4.cpp @@ -1762,8 +1762,7 @@ vec4_visitor::setup_uniforms(int reg) * matter what, or the GPU would hang. */ if (devinfo->gen < 6 && this->uniforms == 0) { - stage_prog_data->param = - reralloc(NULL, stage_prog_data->param, uint32_t, 4); + brw_stage_prog_data_add_params(stage_prog_data, 4); for (unsigned int i = 0; i < 4; i++) { unsigned int slot = this->uniforms * 4 + i; stage_prog_data->param[slot] = BRW_PARAM_BUILTIN_ZERO; |