diff options
| author | Timothy Arceri <[email protected]> | 2016-10-20 16:30:56 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2016-10-26 14:29:36 +1100 |
| commit | 4016f08854a41b50d7636fc5e3cf0dfab5029cab (patch) | |
| tree | 6ba4f8a0e77c142253615fcea4c0bc29023bdb52 /src/compiler | |
| parent | 2f59f3eee591600aa8b3a0b0a30aea321185bcb5 (diff) | |
glsl/st/mesa: use common system values read field
And set system values read directly in shader_info.
st/mesa changes where:
Reviewed-by: Marek Olšák <[email protected]>
Reviewed-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/glsl/ir_set_program_inouts.cpp | 4 | ||||
| -rw-r--r-- | src/compiler/shader_info.c | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/compiler/glsl/ir_set_program_inouts.cpp b/src/compiler/glsl/ir_set_program_inouts.cpp index d8c4d709217..ec589c776d0 100644 --- a/src/compiler/glsl/ir_set_program_inouts.cpp +++ b/src/compiler/glsl/ir_set_program_inouts.cpp @@ -124,7 +124,7 @@ mark(struct gl_program *prog, ir_variable *var, int offset, int len, prog->info.fs.uses_sample_qualifier |= var->data.sample; } } else if (var->data.mode == ir_var_system_value) { - prog->SystemValuesRead |= bitfield; + prog->info.system_values_read |= bitfield; } else { assert(var->data.mode == ir_var_shader_out); if (is_patch_generic) { @@ -432,7 +432,7 @@ do_set_program_inouts(exec_list *instructions, struct gl_program *prog, prog->info.outputs_read = 0; prog->info.patch_inputs_read = 0; prog->info.patch_outputs_written = 0; - prog->SystemValuesRead = 0; + prog->info.system_values_read = 0; if (shader_stage == MESA_SHADER_FRAGMENT) { prog->info.fs.uses_sample_qualifier = false; prog->info.fs.uses_discard = false; diff --git a/src/compiler/shader_info.c b/src/compiler/shader_info.c index fcda73a1d91..83e40cbedc8 100644 --- a/src/compiler/shader_info.c +++ b/src/compiler/shader_info.c @@ -30,6 +30,5 @@ copy_shader_info(const struct gl_shader_program *shader_prog, { shader_info *info = &sh->Program->info; - info->system_values_read = sh->Program->SystemValuesRead; info->uses_texture_gather = sh->Program->UsesGather; } |