[Mesa-dev] [PATCH v3 14/32] glsl: allow image qualifiers inside structures

[Nicolai Hähnle]

Patches 13 & 14:

Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>


On 02.05.2017 22:53, Samuel Pitoiset wrote:
> ARB_bindless_texture allows to declare images inside structures
> which means that qualifiers like writeonly should be allowed.
>
> I have a got a confirmation from Jeff Bolz (one author of the spec),
> because the spec doesn't clearly explain this.
>
> Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
> Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>
> ---
>  src/compiler/glsl/glsl_parser.yy | 27 +++++++++++++++++++++++----
>  1 file changed, 23 insertions(+), 4 deletions(-)
>
> diff --git a/src/compiler/glsl/glsl_parser.yy b/src/compiler/glsl/glsl_parser.yy
> index 9cdc37eb9a..7b93d34fa3 100644
> --- a/src/compiler/glsl/glsl_parser.yy
> +++ b/src/compiler/glsl/glsl_parser.yy
> @@ -2409,10 +2409,29 @@ struct_declaration:
>        ast_fully_specified_type *const type = $1;
>        type->set_location(@1);
>
> -      if (type->qualifier.flags.i != 0)
> -         _mesa_glsl_error(&@1, state,
> -			  "only precision qualifiers may be applied to "
> -			  "structure members");
> +      if (state->has_bindless()) {
> +         ast_type_qualifier input_layout_mask;
> +
> +         /* Allow to declare qualifiers for images. */
> +         input_layout_mask.flags.i = 0;
> +         input_layout_mask.flags.q.coherent = 1;
> +         input_layout_mask.flags.q._volatile = 1;
> +         input_layout_mask.flags.q.restrict_flag = 1;
> +         input_layout_mask.flags.q.read_only = 1;
> +         input_layout_mask.flags.q.write_only = 1;
> +         input_layout_mask.flags.q.explicit_image_format = 1;
> +
> +         if ((type->qualifier.flags.i & ~input_layout_mask.flags.i) != 0) {
> +            _mesa_glsl_error(&@1, state,
> +                             "only precision and image qualifiers may be "
> +                             "applied to structure members");
> +         }
> +      } else {
> +         if (type->qualifier.flags.i != 0)
> +            _mesa_glsl_error(&@1, state,
> +                             "only precision qualifiers may be applied to "
> +                             "structure members");
> +      }
>
>        $$ = new(ctx) ast_declarator_list(type);
>        $$->set_location(@2);
>


-- 
Lerne, wie die Welt wirklich ist,
Aber vergiss niemals, wie sie sein sollte.