[Mesa-dev] [PATCH] glsl: allow conservative depth qualifiers in GLSL 420

[Matt Turner]

On Sat, Apr 2, 2016 at 6:12 PM, Ilia Mirkin <imirkin at alum.mit.edu> wrote:
> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
> ---
>
> Noticed by inspection.
>
>  src/compiler/glsl/ast_to_hir.cpp | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp
> index a609ff9..259bec9 100644
> --- a/src/compiler/glsl/ast_to_hir.cpp
> +++ b/src/compiler/glsl/ast_to_hir.cpp
> @@ -3326,6 +3326,7 @@ apply_layout_qualifier_to_variable(const struct ast_type_qualifier *qual,
>        + qual->flags.q.depth_less
>        + qual->flags.q.depth_unchanged;
>     if (depth_layout_count > 0
> +       && !state->is_version(420, 0)
>         && !state->AMD_conservative_depth_enable
>         && !state->ARB_conservative_depth_enable) {
>         _mesa_glsl_error(loc, state,

There's an error message starting on the next line that should be updated.

I checked around and didn't see any other places that should be
updated. Looks like 4b15cb6da already handled one, while missing these
two.

With the error message updated:

Reviewed-by: Matt Turner <mattst88 at gmail.com>