From e1af20f18a86f52a9640faf2d4ff8a71b0a4fa9b Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Thu, 13 Oct 2016 11:41:23 +1100 Subject: nir/i965/anv/radv/gallium: make shader info a pointer When restoring something from shader cache we won't have and don't want to create a nir_shader this change detaches the two. There are other advantages such as being able to reuse the shader info populated by GLSL IR. Reviewed-by: Jason Ekstrand --- src/intel/blorp/blorp.c | 2 +- src/intel/blorp/blorp_clear.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/intel/blorp') diff --git a/src/intel/blorp/blorp.c b/src/intel/blorp/blorp.c index 08afffe06d1..5209ee23dea 100644 --- a/src/intel/blorp/blorp.c +++ b/src/intel/blorp/blorp.c @@ -224,7 +224,7 @@ brw_blorp_compile_nir_shader(struct blorp_context *blorp, struct nir_shader *nir prog_data->persample_msaa_dispatch = wm_prog_data.persample_dispatch; prog_data->flat_inputs = wm_prog_data.flat_inputs; prog_data->num_varying_inputs = wm_prog_data.num_varying_inputs; - prog_data->inputs_read = nir->info.inputs_read; + prog_data->inputs_read = nir->info->inputs_read; assert(wm_prog_data.base.nr_params == 0); diff --git a/src/intel/blorp/blorp_clear.c b/src/intel/blorp/blorp_clear.c index 8ecfaa382e2..f93278937db 100644 --- a/src/intel/blorp/blorp_clear.c +++ b/src/intel/blorp/blorp_clear.c @@ -56,7 +56,7 @@ blorp_params_get_clear_kernel(struct blorp_context *blorp, nir_builder b; nir_builder_init_simple_shader(&b, NULL, MESA_SHADER_FRAGMENT, NULL); - b.shader->info.name = ralloc_strdup(b.shader, "BLORP-clear"); + b.shader->info->name = ralloc_strdup(b.shader, "BLORP-clear"); nir_variable *v_color = nir_variable_create(b.shader, nir_var_shader_in, glsl_vec4_type(), "v_color"); -- cgit v1.2.3