[Piglit] [PATCH 0/7] More duplicated layout-qualifier-names tests

Timothy Arceri timothy.arceri at collabora.com
Sun Oct 23 23:59:17 UTC 2016


On Sat, 2016-10-22 at 23:42 +0300, Andres Gomez wrote:
> This series complements the work done for mesa at:
> https://lists.freedesktop.org/archives/mesa-dev/2016-October/132990.h
> tml
> 
> Briefing, this is a new set of tests that check the ability to
> support
> multiple layout-qualifers in a single declaration and that only the
> right-most appearance of the same layout-qualifier-name, in a single
> layout-qualifier or across multiple layout-qualifiers in a single
> declaration is taken into account.
> 
> The ARB_shading_language_420pack spec adds the support for multiple
> layout-qualifiers in the same declaration.
> 
> The ARB_enhanced_layouts spec adds the support to repeat the same
> layout-qualifier-name inside a single layout-qualifier.
> 
> In addition, I believe the ARB_enhanced_layouts spec also adds the
> support for multiple layout-qualifiers in the same declaration. This
> is not 100% clear to me since the addition in ARB_enhanced_layouts is
> for a duplicated layout-qualifier-name in a single layout-qualifier
> but it seems to make sense since the change builds up on the
> precondition that multiple layout-qualifiers are already allowed in a
> single declaration.

This is because the spec is written against the GLSL 4.30
Specification. I don't believe this spec should add multiple layout-
qualifiers in the same declaration. Its just that the spec text that is
updated already contains the text.

> 
> In any case, the specific tests which check this support are the ones
> in patches 5/7 and 7/7 so they can be dropped straight away if I
> didn't make a proper interpretation.
> 
> Andres Gomez (7):
>   glsl-1.50: Add GS output layout qualifier redeclaration test
>   arb_tessellation_shader: Add tests for TCS output size
> redeclaration
>   arb_enhanced_layouts: Add more xfb_stride redeclaration tests
>   arb_shading_language_420pack: More multiple layout qualifiers in a
>     single declaration tests
>   arb_enhanced_layouts: Multiple layout qualifiers in a single
>     declaration tests
>   arb_enhanced_layouts: More duplicated layout-qualifier-names tests
>   arb_enhanced_layouts: More multiple layout qualifiers in a single
>     declaration tests
> 
>  ...identifiers-in-single-declaration-mismatch.geom | 38
> +++++++++++++++++++
>  ...vocation-identifiers-in-single-declaration.geom | 38
> +++++++++++++++++++
>  ...tion-identifiers-in-single-layout-mismatch.geom | 38
> +++++++++++++++++++
>  ...le-invocation-identifiers-in-single-layout.geom | 38
> +++++++++++++++++++
>  ...identifiers-in-single-declaration-mismatch.comp | 38
> +++++++++++++++++++
>  ...cal_size-identifiers-in-single-declaration.comp | 38
> +++++++++++++++++++
>  ...size-identifiers-in-single-layout-mismatch.comp | 38
> +++++++++++++++++++
>  ...le-local_size-identifiers-in-single-layout.comp | 38
> +++++++++++++++++++
>  ...-in-single-declaration-no-enhanced-layouts.vert | 22 +++++++++++
>  ...location-identifiers-in-single-declaration.vert | 23 +++++++++++
>  ...identifiers-in-single-declaration-mismatch.geom | 40
> ++++++++++++++++++++
>  ...vertices-identifiers-in-single-declaration.geom | 40
> ++++++++++++++++++++
>  ...ices-identifiers-in-single-layout-mismatch.geom | 40
> ++++++++++++++++++++
>  ...-max_vertices-identifiers-in-single-layout.geom | 40
> ++++++++++++++++++++
>  ...gle-declaration-global-no-enhanced-layouts.geom | 27
> +++++++++++++
>  ...ifiers-in-single-declaration-layout-global.geom | 28
> ++++++++++++++
>  ...-in-single-declaration-no-enhanced-layouts.geom | 25 ++++++++++++
>  ...e-stream-identifiers-in-single-declaration.geom | 26
> +++++++++++++
>  ...identifiers-in-single-declaration-mismatch.tesc | 39
> +++++++++++++++++++
>  ...vertices-identifiers-in-single-declaration.tesc | 39
> +++++++++++++++++++
>  ...ices-identifiers-in-single-layout-mismatch.tesc | 39
> +++++++++++++++++++
>  ...iple-vertices-identifiers-in-single-layout.tesc | 39
> +++++++++++++++++++
>  ...identifiers-in-single-declaration-mismatch.vert | 41
> ++++++++++++++++++++
>  ...k-global-identifiers-in-single-declaration.vert | 41
> ++++++++++++++++++++
>  ...obal-identifiers-in-single-layout-mismatch.vert | 41
> ++++++++++++++++++++
>  ...-block-global-identifiers-in-single-layout.vert | 41
> ++++++++++++++++++++
>  ...identifiers-in-single-declaration-mismatch.vert | 44
> ++++++++++++++++++++++
>  ...de-block-identifiers-in-single-declaration.vert | 44
> ++++++++++++++++++++++
>  ...lock-identifiers-in-single-layout-mismatch.vert | 44
> ++++++++++++++++++++++
>  ..._stride-block-identifiers-in-single-layout.vert | 44
> ++++++++++++++++++++++
>  ...identifiers-in-single-declaration-mismatch.vert | 37
> ++++++++++++++++++
>  ...e-global-identifiers-in-single-declaration.vert | 37
> ++++++++++++++++++
>  ...obal-identifiers-in-single-layout-mismatch.vert | 37
> ++++++++++++++++++
>  ...stride-global-identifiers-in-single-layout.vert | 37
> ++++++++++++++++++
>  ...identifiers-in-single-declaration-mismatch.vert | 41
> ++++++++++++++++++++
>  ...k-global-identifiers-in-single-declaration.vert | 41
> ++++++++++++++++++++
>  ...obal-identifiers-in-single-layout-mismatch.vert | 41
> ++++++++++++++++++++
>  ...dblock-global-identifiers-in-single-layout.vert | 41
> ++++++++++++++++++++
>  ...identifiers-in-single-declaration-mismatch.vert | 44
> ++++++++++++++++++++++
>  ...medblock-identifiers-in-single-declaration.vert | 44
> ++++++++++++++++++++++
>  ...lock-identifiers-in-single-layout-mismatch.vert | 44
> ++++++++++++++++++++++
>  ...de-namedblock-identifiers-in-single-layout.vert | 44
> ++++++++++++++++++++++
>  ...identifiers-in-single-declaration-mismatch.vert | 39
> +++++++++++++++++++
>  ...e-global-identifiers-in-single-declaration.vert | 39
> +++++++++++++++++++
>  ...obal-identifiers-in-single-layout-mismatch.vert | 39
> +++++++++++++++++++
>  ...riable-global-identifiers-in-single-layout.vert | 39
> +++++++++++++++++++
>  ...identifiers-in-single-declaration-mismatch.vert | 39
> +++++++++++++++++++
>  ...variable-identifiers-in-single-declaration.vert | 39
> +++++++++++++++++++
>  ...able-identifiers-in-single-layout-mismatch.vert | 39
> +++++++++++++++++++
>  ...ride-variable-identifiers-in-single-layout.vert | 39
> +++++++++++++++++++
>  .../xfb_stride/block-stride-match-global.vert      | 31
> +++++++++++++++
>  .../xfb_stride/block-stride-match.vert             | 29
> ++++++++++++++
>  .../xfb_stride/block-stride-mismatch-global.vert   | 31
> +++++++++++++++
>  .../xfb_stride/block-stride-mismatch.vert          | 29
> ++++++++++++++
>  .../xfb_stride/global-stride-match.vert            | 22 +++++++++++
>  .../xfb_stride/global-stride-mismatch.vert         | 22 +++++++++++
>  .../named-block-stride-match-global.vert           | 31
> +++++++++++++++
>  .../xfb_stride/named-block-stride-match.vert       | 29
> ++++++++++++++
>  .../named-block-stride-mismatch-global.vert        | 31
> +++++++++++++++
>  .../xfb_stride/named-block-stride-mismatch.vert    | 29
> ++++++++++++++
>  .../xfb_stride/variable-stride-match-global.vert   | 26
> +++++++++++++
>  .../xfb_stride/variable-stride-match.vert          | 24 ++++++++++++
>  .../variable-stride-mismatch-global.vert           |  6 +--
>  .../xfb_stride/variable-stride-mismatch.vert       |  6 +--
>  ...-invocation-in-single-declaration-mismatch.geom | 31
> +++++++++++++++
>  .../multiple-invocation-in-single-declaration.geom | 29
> ++++++++++++++
>  ...-local_size-in-single-declaration-mismatch.comp | 29
> ++++++++++++++
>  .../multiple-local_size-in-single-declaration.comp | 29
> ++++++++++++++
>  ...ax_vertices-in-single-declaration-mismatch.geom | 31
> +++++++++++++++
>  ...ultiple-max_vertices-in-single-declaration.geom | 31
> +++++++++++++++
>  ...le-vertices-in-single-declaration-mismatch.tesc | 30
> +++++++++++++++
>  .../multiple-vertices-in-single-declaration.tesc   | 30
> +++++++++++++++
>  ...e-qualifier-declarations-vertices-mismatch.tesc | 23 +++++++++++
>  ...t-multiple-qualifier-declarations-vertices.tesc | 23 +++++++++++
>  ...ut-declaration-consistent-with-prev-layout.geom | 37
> ++++++++++++++++++
>  75 files changed, 2574 insertions(+), 6 deletions(-)
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-invocation-identifiers-in-single-declaration-
> mismatch.geom
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-invocation-identifiers-in-single-
> declaration.geom
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-invocation-identifiers-in-single-layout-
> mismatch.geom
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-invocation-identifiers-in-single-layout.geom
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-local_size-identifiers-in-single-declaration-
> mismatch.comp
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-local_size-identifiers-in-single-
> declaration.comp
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-local_size-identifiers-in-single-layout-
> mismatch.comp
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-local_size-identifiers-in-single-layout.comp
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-location-identifiers-in-single-declaration-no-
> enhanced-layouts.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-location-identifiers-in-single-declaration.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-max_vertices-identifiers-in-single-declaration-
> mismatch.geom
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-max_vertices-identifiers-in-single-
> declaration.geom
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-max_vertices-identifiers-in-single-layout-
> mismatch.geom
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-max_vertices-identifiers-in-single-layout.geom
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-stream-identifiers-in-single-declaration-global-
> no-enhanced-layouts.geom
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-stream-identifiers-in-single-declaration-layout-
> global.geom
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-stream-identifiers-in-single-declaration-no-
> enhanced-layouts.geom
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-stream-identifiers-in-single-declaration.geom
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-vertices-identifiers-in-single-declaration-
> mismatch.tesc
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-vertices-identifiers-in-single-declaration.tesc
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-vertices-identifiers-in-single-layout-
> mismatch.tesc
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-vertices-identifiers-in-single-layout.tesc
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-xfb_stride-block-global-identifiers-in-single-
> declaration-mismatch.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-xfb_stride-block-global-identifiers-in-single-
> declaration.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-xfb_stride-block-global-identifiers-in-single-
> layout-mismatch.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-xfb_stride-block-global-identifiers-in-single-
> layout.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-xfb_stride-block-identifiers-in-single-
> declaration-mismatch.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-xfb_stride-block-identifiers-in-single-
> declaration.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-xfb_stride-block-identifiers-in-single-layout-
> mismatch.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-xfb_stride-block-identifiers-in-single-
> layout.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-xfb_stride-global-identifiers-in-single-
> declaration-mismatch.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-xfb_stride-global-identifiers-in-single-
> declaration.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-xfb_stride-global-identifiers-in-single-layout-
> mismatch.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-xfb_stride-global-identifiers-in-single-
> layout.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-xfb_stride-namedblock-global-identifiers-in-
> single-declaration-mismatch.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-xfb_stride-namedblock-global-identifiers-in-
> single-declaration.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-xfb_stride-namedblock-global-identifiers-in-
> single-layout-mismatch.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-xfb_stride-namedblock-global-identifiers-in-
> single-layout.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-xfb_stride-namedblock-identifiers-in-single-
> declaration-mismatch.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-xfb_stride-namedblock-identifiers-in-single-
> declaration.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-xfb_stride-namedblock-identifiers-in-single-
> layout-mismatch.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-xfb_stride-namedblock-identifiers-in-single-
> layout.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-xfb_stride-variable-global-identifiers-in-
> single-declaration-mismatch.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-xfb_stride-variable-global-identifiers-in-
> single-declaration.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-xfb_stride-variable-global-identifiers-in-
> single-layout-mismatch.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-xfb_stride-variable-global-identifiers-in-
> single-layout.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-xfb_stride-variable-identifiers-in-single-
> declaration-mismatch.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-xfb_stride-variable-identifiers-in-single-
> declaration.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-xfb_stride-variable-identifiers-in-single-
> layout-mismatch.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-
> identifiers/multiple-xfb_stride-variable-identifiers-in-single-
> layout.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/transform-feedback-layout-
> qualifiers/xfb_stride/block-stride-match-global.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/transform-feedback-layout-
> qualifiers/xfb_stride/block-stride-match.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/transform-feedback-layout-
> qualifiers/xfb_stride/block-stride-mismatch-global.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/transform-feedback-layout-
> qualifiers/xfb_stride/block-stride-mismatch.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/transform-feedback-layout-
> qualifiers/xfb_stride/global-stride-match.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/transform-feedback-layout-
> qualifiers/xfb_stride/global-stride-mismatch.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/transform-feedback-layout-
> qualifiers/xfb_stride/named-block-stride-match-global.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/transform-feedback-layout-
> qualifiers/xfb_stride/named-block-stride-match.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/transform-feedback-layout-
> qualifiers/xfb_stride/named-block-stride-mismatch-global.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/transform-feedback-layout-
> qualifiers/xfb_stride/named-block-stride-mismatch.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/transform-feedback-layout-
> qualifiers/xfb_stride/variable-stride-match-global.vert
>  create mode 100644
> tests/spec/arb_enhanced_layouts/compiler/transform-feedback-layout-
> qualifiers/xfb_stride/variable-stride-match.vert
>  create mode 100644
> tests/spec/arb_shading_language_420pack/compiler/layout-
> qualifiers/multiple-invocation-in-single-declaration-mismatch.geom
>  create mode 100644
> tests/spec/arb_shading_language_420pack/compiler/layout-
> qualifiers/multiple-invocation-in-single-declaration.geom
>  create mode 100644
> tests/spec/arb_shading_language_420pack/compiler/layout-
> qualifiers/multiple-local_size-in-single-declaration-mismatch.comp
>  create mode 100644
> tests/spec/arb_shading_language_420pack/compiler/layout-
> qualifiers/multiple-local_size-in-single-declaration.comp
>  create mode 100644
> tests/spec/arb_shading_language_420pack/compiler/layout-
> qualifiers/multiple-max_vertices-in-single-declaration-mismatch.geom
>  create mode 100644
> tests/spec/arb_shading_language_420pack/compiler/layout-
> qualifiers/multiple-max_vertices-in-single-declaration.geom
>  create mode 100644
> tests/spec/arb_shading_language_420pack/compiler/layout-
> qualifiers/multiple-vertices-in-single-declaration-mismatch.tesc
>  create mode 100644
> tests/spec/arb_shading_language_420pack/compiler/layout-
> qualifiers/multiple-vertices-in-single-declaration.tesc
>  create mode 100644
> tests/spec/arb_tessellation_shader/compiler/layout-multiple-
> qualifier-declarations-vertices-mismatch.tesc
>  create mode 100644
> tests/spec/arb_tessellation_shader/compiler/layout-multiple-
> qualifier-declarations-vertices.tesc
>  create mode 100644 tests/spec/glsl-1.50/compiler/layout-out-
> declaration-consistent-with-prev-layout.geom
> 


More information about the Piglit mailing list