[Mesa-dev] [PATCH 2/3] glsl: reject format qualifiers with non-image types everywhere

Nicolai Hähnle nhaehnle at gmail.com
Wed May 3 15:26:05 UTC 2017


On 01.05.2017 12:34, Samuel Pitoiset wrote:
> Including structures, interfaces and uniform blocks.
>
> Fixes the following ARB_shader_image_load_store test:
>
> format-layout-with-non-image-type.frag
>
> Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>

Patches 1&2:

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


> ---
>  src/compiler/glsl/ast_to_hir.cpp | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp
> index 88926e7e22..a3f8a5a8c9 100644
> --- a/src/compiler/glsl/ast_to_hir.cpp
> +++ b/src/compiler/glsl/ast_to_hir.cpp
> @@ -6893,6 +6893,8 @@ ast_process_struct_or_iface_block_members(exec_list *instructions,
>                            "to struct or interface block members");
>        }
>
> +      validate_image_format_qualifier_for_type(state, &loc, qual, decl_type);
> +
>        /* From Section 4.4.2.3 (Geometry Outputs) of the GLSL 4.50 spec:
>         *
>         *   "A block member may be declared with a stream identifier, but
>


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


More information about the mesa-dev mailing list