From: Timothy Arceri Date: Wed, 16 Nov 2016 23:51:19 +0000 (+1100) Subject: st/mesa: stop initialing Instructions and NumInstructions X-Git-Tag: upstream/17.1.0~4637 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d6bdb3a86293da2164e9355f0262ef83afeece7f;p=platform%2Fupstream%2Fmesa.git st/mesa: stop initialing Instructions and NumInstructions Since gl_program is now created with rzalloc() they should already be initialised. Reviewed-by: Emil Velikov --- diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp index a412806..36531ad 100644 --- a/src/mesa/state_tracker/st_glsl_to_nir.cpp +++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp @@ -417,9 +417,6 @@ st_nir_get_mesa_program(struct gl_context *ctx, _mesa_log("\n\n"); } - prog->Instructions = NULL; - prog->NumInstructions = 0; - prog->SamplersUsed = shader->active_samplers; prog->ShadowSamplers = shader->shadow_samplers; prog->ExternalSamplersUsed = gl_external_samplers(shader); diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp index 7f19839..7d67a59 100644 --- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp @@ -6501,9 +6501,6 @@ get_mesa_program_tgsi(struct gl_context *ctx, _mesa_log("\n\n"); } - prog->Instructions = NULL; - prog->NumInstructions = 0; - do_set_program_inouts(shader->ir, prog, shader->Stage); _mesa_copy_linked_program_data(shader_program, shader); shrink_array_declarations(v->inputs, v->num_inputs,