summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Arceri <timothy.arceri@collabora.com>2016-11-17 10:51:19 +1100
committerTimothy Arceri <timothy.arceri@collabora.com>2016-11-17 12:52:59 +1100
commitd6bdb3a86293da2164e9355f0262ef83afeece7f (patch)
treecd8d2105639c3191f3f660a954b2a92e3ed50124
parent0ad69e6b51b06c483db37c3b7eeb1da1a95d0629 (diff)
st/mesa: stop initialing Instructions and NumInstructions
Since gl_program is now created with rzalloc() they should already be initialised. Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
-rw-r--r--src/mesa/state_tracker/st_glsl_to_nir.cpp3
-rw-r--r--src/mesa/state_tracker/st_glsl_to_tgsi.cpp3
2 files changed, 0 insertions, 6 deletions
diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp
index a4128064189..36531ad3047 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 7f19839d30e..7d67a598f0a 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,