KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <juhapekka.heikkila@gmail.com>
CC: timothy.arceri@collabora.com
Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>
This commit is contained in:
Juha-Pekka Heikkila 2015-12-02 11:48:46 +02:00
parent 231db5869c
commit d6d90750f1
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/glsl/linker.cpp
View File

@ -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) {