diff options
| author | Timothy Arceri <[email protected]> | 2016-10-20 16:17:23 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2016-10-26 14:29:36 +1100 |
| commit | fdf42d3abc1cfa723d8cf5e46fb86061416602e6 (patch) | |
| tree | 4d8f352dd7b7d4700c203982f9d8fcc867681f88 | |
| parent | 5346630593bec80efa732c40b63e0e95a00af074 (diff) | |
glsl: set outputs read directly in shader_info
Reviewed-by: Jason Ekstrand <[email protected]>
| -rw-r--r-- | src/compiler/glsl/ir_set_program_inouts.cpp | 4 | ||||
| -rw-r--r-- | src/compiler/shader_info.c | 1 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/src/compiler/glsl/ir_set_program_inouts.cpp b/src/compiler/glsl/ir_set_program_inouts.cpp index 9a33d56d881..7cd5d0ca0c6 100644 --- a/src/compiler/glsl/ir_set_program_inouts.cpp +++ b/src/compiler/glsl/ir_set_program_inouts.cpp @@ -136,7 +136,7 @@ mark(struct gl_program *prog, ir_variable *var, int offset, int len, } if (var->data.fb_fetch_output) - prog->OutputsRead |= bitfield; + prog->info.outputs_read |= bitfield; } } } @@ -429,7 +429,7 @@ do_set_program_inouts(exec_list *instructions, struct gl_program *prog, prog->info.inputs_read = 0; prog->info.outputs_written = 0; prog->SecondaryOutputsWritten = 0; - prog->OutputsRead = 0; + prog->info.outputs_read = 0; prog->PatchInputsRead = 0; prog->PatchOutputsWritten = 0; prog->SystemValuesRead = 0; diff --git a/src/compiler/shader_info.c b/src/compiler/shader_info.c index 355bee0f040..af8b6c2a1c7 100644 --- a/src/compiler/shader_info.c +++ b/src/compiler/shader_info.c @@ -30,7 +30,6 @@ copy_shader_info(const struct gl_shader_program *shader_prog, { shader_info *info = &sh->Program->info; - info->outputs_read = sh->Program->OutputsRead; info->patch_inputs_read = sh->Program->PatchInputsRead; info->patch_outputs_written = sh->Program->PatchOutputsWritten; info->system_values_read = sh->Program->SystemValuesRead; diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 0b8844c2165..468d7544a9a 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1923,7 +1923,6 @@ struct gl_program struct shader_info info; GLbitfield64 SecondaryOutputsWritten; /**< Subset of OutputsWritten outputs written with non-zero index. */ - GLbitfield64 OutputsRead; /**< Bitmask of which output regs are read */ GLbitfield PatchInputsRead; /**< VAR[0..31] usage for patch inputs (user-defined only) */ GLbitfield PatchOutputsWritten; /**< VAR[0..31] usage for patch outputs (user-defined only) */ GLbitfield SystemValuesRead; /**< Bitmask of SYSTEM_VALUE_x inputs used */ |