Mesa (master): st/mesa: stop initialing Instructions and NumInstructions
Timothy Arceri
tarceri at kemper.freedesktop.org
Thu Nov 17 01:53:25 UTC 2016
Module: Mesa
Branch: master
Commit: d6bdb3a86293da2164e9355f0262ef83afeece7f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d6bdb3a86293da2164e9355f0262ef83afeece7f
Author: Timothy Arceri <timothy.arceri at collabora.com>
Date: Thu Nov 17 10:51:19 2016 +1100
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 at collabora.com>
---
src/mesa/state_tracker/st_glsl_to_nir.cpp | 3 ---
src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 3 ---
2 files changed, 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 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,
More information about the mesa-commit
mailing list