diff options
| author | Juha-Pekka Heikkila <[email protected]> | 2015-12-02 11:48:46 +0200 |
|---|---|---|
| committer | Juha-Pekka Heikkila <[email protected]> | 2015-12-03 10:56:35 +0200 |
| commit | d6d90750f129f4c43c55acfefa9b82d32b0b3e21 (patch) | |
| tree | f37c6a279a0a7fa8cf0fa5f03f0fade653382ada /src/glsl | |
| parent | 231db5869c2c0f32608f39100bffff569da21bea (diff) | |
glsl: remove useless null checks and make match_explicit_outputs_to_inputs() static
match_explicit_outputs_to_inputs() cannot get null inputs and if it ever did
triggering first null check would later in the function cause segfault.
Signed-off-by: Juha-Pekka Heikkila <[email protected]>
CC: [email protected]
Reviewed-by: Timothy Arceri <[email protected]>
Diffstat (limited to 'src/glsl')
| -rw-r--r-- | src/glsl/linker.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp index 660c4354e90..ae628cd86bd 100644 --- a/src/glsl/linker.cpp +++ b/src/glsl/linker.cpp @@ -2687,7 +2687,7 @@ assign_attribute_or_color_locations(gl_shader_program *prog, * Match explicit locations of outputs to inputs and deactivate the * unmatch flag if found so we don't optimise them away. */ -void +static void match_explicit_outputs_to_inputs(struct gl_shader_program *prog, gl_shader *producer, gl_shader *consumer) @@ -2703,10 +2703,6 @@ match_explicit_outputs_to_inputs(struct gl_shader_program *prog, if ((var == NULL) || (var->data.mode != ir_var_shader_out)) continue; - /* Mark output as matched if separate shader with no linked consumer */ - if (consumer == NULL) - var->data.is_unmatched_generic_inout = 0; - if (var->data.explicit_location && var->data.location >= VARYING_SLOT_VAR0) { const unsigned idx = var->data.location - VARYING_SLOT_VAR0; @@ -2722,10 +2718,6 @@ match_explicit_outputs_to_inputs(struct gl_shader_program *prog, if ((input == NULL) || (input->data.mode != ir_var_shader_in)) continue; - /* Mark input as matched if separate shader with no linked producer */ - if (producer == NULL) - input->data.is_unmatched_generic_inout = 0; - ir_variable *output = NULL; if (input->data.explicit_location && input->data.location >= VARYING_SLOT_VAR0) { |