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/mesa/program | |
| 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/mesa/program')
| -rw-r--r-- | src/mesa/program/prog_to_nir.c | 1 | ||||
| -rw-r--r-- | src/mesa/program/program.c | 4 | ||||
| -rw-r--r-- | src/mesa/program/programopt.c | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/mesa/program/prog_to_nir.c b/src/mesa/program/prog_to_nir.c index 3c62456106c..08df05dc776 100644 --- a/src/mesa/program/prog_to_nir.c +++ b/src/mesa/program/prog_to_nir.c @@ -1051,7 +1051,6 @@ prog_to_nir(const struct gl_program *prog, s->info->num_abos = 0; s->info->num_ssbos = 0; s->info->num_images = 0; - s->info->system_values_read = prog->SystemValuesRead; s->info->uses_texture_gather = false; s->info->uses_clip_distance_out = false; s->info->separate_shader = false; diff --git a/src/mesa/program/program.c b/src/mesa/program/program.c index 4915a09170f..3b7745b905a 100644 --- a/src/mesa/program/program.c +++ b/src/mesa/program/program.c @@ -521,8 +521,8 @@ _mesa_get_min_invocations_per_fragment(struct gl_context *ctx, if (prog->info.fs.uses_sample_qualifier && !ignore_sample_qualifier) return MAX2(_mesa_geometric_samples(ctx->DrawBuffer), 1); - if (prog->SystemValuesRead & (SYSTEM_BIT_SAMPLE_ID | - SYSTEM_BIT_SAMPLE_POS)) + if (prog->info.system_values_read & (SYSTEM_BIT_SAMPLE_ID | + SYSTEM_BIT_SAMPLE_POS)) return MAX2(_mesa_geometric_samples(ctx->DrawBuffer), 1); else if (ctx->Multisample.SampleShading) return MAX2(ceil(ctx->Multisample.MinSampleShadingValue * diff --git a/src/mesa/program/programopt.c b/src/mesa/program/programopt.c index b4bbbdae76b..1b50b5b7a0e 100644 --- a/src/mesa/program/programopt.c +++ b/src/mesa/program/programopt.c @@ -596,7 +596,7 @@ _mesa_program_fragment_position_to_sysval(struct gl_program *prog) return; prog->info.inputs_read &= ~BITFIELD64_BIT(VARYING_SLOT_POS); - prog->SystemValuesRead |= 1 << SYSTEM_VALUE_FRAG_COORD; + prog->info.system_values_read |= 1 << SYSTEM_VALUE_FRAG_COORD; for (i = 0; i < prog->NumInstructions; i++) { struct prog_instruction *inst = prog->Instructions + i; |