diff options
| -rw-r--r-- | src/mesa/program/program.c | 11 | ||||
| -rw-r--r-- | src/mesa/program/program.h | 3 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_atom_msaa.c | 2 |
3 files changed, 6 insertions, 10 deletions
diff --git a/src/mesa/program/program.c b/src/mesa/program/program.c index 220efc35394..6aba3cb3f10 100644 --- a/src/mesa/program/program.c +++ b/src/mesa/program/program.c @@ -515,8 +515,7 @@ _mesa_find_free_register(const GLboolean used[], */ GLint _mesa_get_min_invocations_per_fragment(struct gl_context *ctx, - const struct gl_program *prog, - bool ignore_sample_qualifier) + const struct gl_program *prog) { /* From ARB_sample_shading specification: * "Using gl_SampleID in a fragment shader causes the entire shader @@ -534,11 +533,9 @@ _mesa_get_min_invocations_per_fragment(struct gl_context *ctx, * "Use of the "sample" qualifier on a fragment shader input * forces per-sample shading" */ - if (prog->info.fs.uses_sample_qualifier && !ignore_sample_qualifier) - return MAX2(_mesa_geometric_samples(ctx->DrawBuffer), 1); - - if (prog->info.system_values_read & (SYSTEM_BIT_SAMPLE_ID | - SYSTEM_BIT_SAMPLE_POS)) + if (prog->info.fs.uses_sample_qualifier || + (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/program.h b/src/mesa/program/program.h index 376da7b2d41..659385f55b1 100644 --- a/src/mesa/program/program.h +++ b/src/mesa/program/program.h @@ -108,8 +108,7 @@ _mesa_find_free_register(const GLboolean used[], extern GLint _mesa_get_min_invocations_per_fragment(struct gl_context *ctx, - const struct gl_program *prog, - bool ignore_sample_qualifier); + const struct gl_program *prog); static inline GLuint _mesa_program_enum_to_shader_stage(GLenum v) diff --git a/src/mesa/state_tracker/st_atom_msaa.c b/src/mesa/state_tracker/st_atom_msaa.c index 589e328ac55..556c7c5889e 100644 --- a/src/mesa/state_tracker/st_atom_msaa.c +++ b/src/mesa/state_tracker/st_atom_msaa.c @@ -77,5 +77,5 @@ st_update_sample_shading(struct st_context *st) return; cso_set_min_samples(st->cso_context, - _mesa_get_min_invocations_per_fragment(st->ctx, &st->fp->Base, false)); + _mesa_get_min_invocations_per_fragment(st->ctx, &st->fp->Base)); } |