[01/10] arb_enhanced_layouts: corrected multiple comments

Submitted by Andres Gomez on Feb. 1, 2019, 5:55 p.m.

Details

Message ID 20190201175524.24454-2-agomez@igalia.com
State Accepted
Commit db98d3a78e6219b275b59096e96ef6ab1ec8e61a
Headers show
Series "arb_enhanced_layouts: additional tests" ( rev: 2 1 ) in Piglit

Not browsing as part of any series.

Commit Message

Andres Gomez Feb. 1, 2019, 5:55 p.m.
Cc: Timothy Arceri <tarceri@itsqueeze.com>
Signed-off-by: Andres Gomez <agomez@igalia.com>
---
 .../vs-gs-fs-double.shader_test               | 16 +++----
 .../vs-tcs-tes-fs-double.shader_test          | 42 +++++++++++++------
 ...-fs-type-mismatch-double-float.shader_test |  4 +-
 ...-fs-type-mismatch-signed-float.shader_test |  4 +-
 ...-type-mismatch-signed-unsigned.shader_test |  4 +-
 ...s-type-mismatch-unsigned-float.shader_test |  4 +-
 6 files changed, 46 insertions(+), 28 deletions(-)

Patch hide | download patch | download mbox

diff --git a/tests/spec/arb_enhanced_layouts/execution/component-layout/vs-gs-fs-double.shader_test b/tests/spec/arb_enhanced_layouts/execution/component-layout/vs-gs-fs-double.shader_test
index bf5d6e8e6..1f753792a 100644
--- a/tests/spec/arb_enhanced_layouts/execution/component-layout/vs-gs-fs-double.shader_test
+++ b/tests/spec/arb_enhanced_layouts/execution/component-layout/vs-gs-fs-double.shader_test
@@ -12,10 +12,10 @@  GL_ARB_gpu_shader_fp64
 #extension GL_ARB_separate_shader_objects: require
 #extension GL_ARB_gpu_shader_fp64: require
 
-// consume X/Y/Z components
+// consume X/Y components in location 1
 layout(location = 0) flat out dvec3 a;
 
-// consumes W component
+// consume Z/W components
 layout(location = 1, component = 2) flat out double b;
 
 out vec4 vertex_to_gs;
@@ -39,18 +39,18 @@  void main()
 layout(triangles) in;
 layout(triangle_strip, max_vertices = 3) out;
 
-// consume X/Y/Z components
+// consume X/Y components in location 1
 layout(location = 0) flat in dvec3 a[3];
 
-// consumes W component
+// consume Z/W components
 layout(location = 1, component = 2) flat in double b[3];
 
 in vec4 vertex_to_gs[3];
 
-// consume X/Y/Z components
+// consume X/Y components in location 1
 layout(location = 0) flat out dvec3 a_to_fs;
 
-// consumes W component
+// consume Z/W components
 layout(location = 1, component = 2) flat out double b_to_fs;
 
 void main()
@@ -71,10 +71,10 @@  void main()
 
 out vec4 color;
 
-// consume X/Y/Z components
+// consume X/Y components in location 1
 layout(location = 0) flat in dvec3 a_to_fs;
 
-// consumes W component
+// consume Z/W components
 layout(location = 1, component = 2) flat in double b_to_fs;
 
 void main()
diff --git a/tests/spec/arb_enhanced_layouts/execution/component-layout/vs-tcs-tes-fs-double.shader_test b/tests/spec/arb_enhanced_layouts/execution/component-layout/vs-tcs-tes-fs-double.shader_test
index 938d2703d..196729aab 100644
--- a/tests/spec/arb_enhanced_layouts/execution/component-layout/vs-tcs-tes-fs-double.shader_test
+++ b/tests/spec/arb_enhanced_layouts/execution/component-layout/vs-tcs-tes-fs-double.shader_test
@@ -15,13 +15,16 @@  GL_ARB_gpu_shader_fp64
 
 in vec4 vertex;
 
-// consume Y/Z/W components
+// consume also X/Y components in location 1
 layout(location = 0) flat out dvec3 a;
 
-// consumes X component
+// consume Z/W components
 layout(location = 1, component = 2) flat out double b;
 
+// consume X/Y components
 layout(location = 2, component = 0) flat out double c;
+
+// consume Z/W components
 layout(location = 2, component = 2) flat out double d;
 
 void main()
@@ -44,22 +47,28 @@  void main()
 
 layout(vertices = 3) out;
 
-// consume Y/Z/W components
+// consume also X/Y components in location 1
 layout(location = 0) flat in dvec3 a[];
 
-// consumes X component
+// consume Z/W components
 layout(location = 1, component = 2) flat in double b[];
 
+// consume X/Y components
 layout(location = 2, component = 0) flat in double c[];
+
+// consume Z/W components
 layout(location = 2, component = 2) flat in double d[];
 
-// consume Y/Z/W components
+// consume also X/Y components in location 1
 layout(location = 0) flat out dvec3 a_tcs[];
 
-// consumes X component
+// consume Z/W components
 layout(location = 1, component = 2) flat out double b_tcs[];
 
+// consume X/Y components
 layout(location = 2, component = 0) flat out double c_tcs[];
+
+// consume Z/W components
 layout(location = 2, component = 2) flat out double d_tcs[];
 
 void main() {
@@ -82,22 +91,28 @@  void main() {
 
 layout(triangles) in;
 
-// consume Y/Z/W components
+// consume also X/Y components in location 1
 layout(location = 0) flat in dvec3 a_tcs[];
 
-// consumes X component
+// consume Z/W components
 layout(location = 1, component = 2) flat in double b_tcs[];
 
+// consume X/Y components
 layout(location = 2, component = 0) flat in double c_tcs[];
+
+// consume Z/W components
 layout(location = 2, component = 2) flat in double d_tcs[];
 
-// consume Y/Z/W components
+// consume also X/Y components in location 1
 layout(location = 0) flat out dvec3 a_tes;
 
-// consumes X component
+// consume Z/W components
 layout(location = 1, component = 2) flat out double b_tes;
 
+// consume X/Y components
 layout(location = 2, component = 0) flat out double c_tes;
+
+// consume Z/W components
 layout(location = 2, component = 2) flat out double d_tes;
 
 void main() {
@@ -119,13 +134,16 @@  void main() {
 
 out vec4 color;
 
-// consume Y/Z/W components
+// consume also X/Y components in location 1
 layout(location = 0) flat in dvec3 a_tes;
 
-// consumes X component
+// consume Z/W components
 layout(location = 1, component = 2) flat in double b_tes;
 
+// consume X/Y components
 layout(location = 2, component = 0) flat in double c_tes;
+
+// consume Z/W components
 layout(location = 2, component = 2) flat in double d_tes;
 
 void main()
diff --git a/tests/spec/arb_enhanced_layouts/linker/component-layout/vs-to-fs-type-mismatch-double-float.shader_test b/tests/spec/arb_enhanced_layouts/linker/component-layout/vs-to-fs-type-mismatch-double-float.shader_test
index 7e51c4ccc..1f822c025 100644
--- a/tests/spec/arb_enhanced_layouts/linker/component-layout/vs-to-fs-type-mismatch-double-float.shader_test
+++ b/tests/spec/arb_enhanced_layouts/linker/component-layout/vs-to-fs-type-mismatch-double-float.shader_test
@@ -27,7 +27,7 @@  GL_ARB_gpu_shader_fp64
 // consume X/Y components
 layout(location = 7, component = 0) flat out double a;
 
-// consumes Y component
+// consumes Z component
 layout(location = 7, component = 2) out float b;
 
 void main()
@@ -47,7 +47,7 @@  out vec4 color;
 // consume X/Y components
 layout(location = 7, component = 0) flat in double a;
 
-// consumes Y component
+// consumes Z component
 layout(location = 7, component = 2) in float b;
 
 void main()
diff --git a/tests/spec/arb_enhanced_layouts/linker/component-layout/vs-to-fs-type-mismatch-signed-float.shader_test b/tests/spec/arb_enhanced_layouts/linker/component-layout/vs-to-fs-type-mismatch-signed-float.shader_test
index 8c6219823..0bc933452 100644
--- a/tests/spec/arb_enhanced_layouts/linker/component-layout/vs-to-fs-type-mismatch-signed-float.shader_test
+++ b/tests/spec/arb_enhanced_layouts/linker/component-layout/vs-to-fs-type-mismatch-signed-float.shader_test
@@ -41,10 +41,10 @@  void main()
 
 out vec4 color;
 
-// consume Y/Z/W components of 32 vectors
+// consume X/Y/Z components
 layout(location = 0) flat in ivec3 a;
 
-// consumes X component of first vector
+// consumes W component
 layout(location = 0, component = 3) flat in float b;
 
 void main()
diff --git a/tests/spec/arb_enhanced_layouts/linker/component-layout/vs-to-fs-type-mismatch-signed-unsigned.shader_test b/tests/spec/arb_enhanced_layouts/linker/component-layout/vs-to-fs-type-mismatch-signed-unsigned.shader_test
index 62bd8efba..34d1138cd 100644
--- a/tests/spec/arb_enhanced_layouts/linker/component-layout/vs-to-fs-type-mismatch-signed-unsigned.shader_test
+++ b/tests/spec/arb_enhanced_layouts/linker/component-layout/vs-to-fs-type-mismatch-signed-unsigned.shader_test
@@ -41,10 +41,10 @@  void main()
 
 out vec4 color;
 
-// consume Y/Z/W components of 32 vectors
+// consume X/Y/Z components
 layout(location = 0) flat in ivec3 a;
 
-// consumes X component of first vector
+// consumes W component
 layout(location = 0, component = 3) flat in uint b;
 
 void main()
diff --git a/tests/spec/arb_enhanced_layouts/linker/component-layout/vs-to-fs-type-mismatch-unsigned-float.shader_test b/tests/spec/arb_enhanced_layouts/linker/component-layout/vs-to-fs-type-mismatch-unsigned-float.shader_test
index 1d847232f..39c37f6ac 100644
--- a/tests/spec/arb_enhanced_layouts/linker/component-layout/vs-to-fs-type-mismatch-unsigned-float.shader_test
+++ b/tests/spec/arb_enhanced_layouts/linker/component-layout/vs-to-fs-type-mismatch-unsigned-float.shader_test
@@ -41,10 +41,10 @@  void main()
 
 out vec4 color;
 
-// consume Y/Z/W components of 32 vectors
+// consume X/Y/Z components
 layout(location = 0) flat in uvec3 a;
 
-// consumes X component of first vector
+// consumes W component
 layout(location = 0, component = 3) flat in float b;
 
 void main()

Comments

On 2/2/19 4:55 am, Andres Gomez wrote:
> Cc: Timothy Arceri <tarceri@itsqueeze.com>
> Signed-off-by: Andres Gomez <agomez@igalia.com>
> ---
>   .../vs-gs-fs-double.shader_test               | 16 +++----
>   .../vs-tcs-tes-fs-double.shader_test          | 42 +++++++++++++------
>   ...-fs-type-mismatch-double-float.shader_test |  4 +-
>   ...-fs-type-mismatch-signed-float.shader_test |  4 +-
>   ...-type-mismatch-signed-unsigned.shader_test |  4 +-
>   ...s-type-mismatch-unsigned-float.shader_test |  4 +-
>   6 files changed, 46 insertions(+), 28 deletions(-)
> 
> diff --git a/tests/spec/arb_enhanced_layouts/execution/component-layout/vs-gs-fs-double.shader_test b/tests/spec/arb_enhanced_layouts/execution/component-layout/vs-gs-fs-double.shader_test
> index bf5d6e8e6..1f753792a 100644
> --- a/tests/spec/arb_enhanced_layouts/execution/component-layout/vs-gs-fs-double.shader_test
> +++ b/tests/spec/arb_enhanced_layouts/execution/component-layout/vs-gs-fs-double.shader_test
> @@ -12,10 +12,10 @@ GL_ARB_gpu_shader_fp64
>   #extension GL_ARB_separate_shader_objects: require
>   #extension GL_ARB_gpu_shader_fp64: require
>   
> -// consume X/Y/Z components
> +// consume X/Y components in location 1

This should be:

    // consume X/Y/Z/W components in location 0
    // consume X/Y components in location 1

>   layout(location = 0) flat out dvec3 a;
>   
> -// consumes W component
> +// consume Z/W components
>   layout(location = 1, component = 2) flat out double b;
>   
>   out vec4 vertex_to_gs;
> @@ -39,18 +39,18 @@ void main()
>   layout(triangles) in;
>   layout(triangle_strip, max_vertices = 3) out;
>   
> -// consume X/Y/Z components
> +// consume X/Y components in location 1

This should be:

    // consume X/Y/Z/W components in location 0
    // consume X/Y components in location 1

>   layout(location = 0) flat in dvec3 a[3];
>   
> -// consumes W component
> +// consume Z/W components
>   layout(location = 1, component = 2) flat in double b[3];
>   
>   in vec4 vertex_to_gs[3];
>   
> -// consume X/Y/Z components
> +// consume X/Y components in location 1
>   layout(location = 0) flat out dvec3 a_to_fs;
>   
> -// consumes W component
> +// consume Z/W components
>   layout(location = 1, component = 2) flat out double b_to_fs;
>   
>   void main()
> @@ -71,10 +71,10 @@ void main()
>   
>   out vec4 color;
>   
> -// consume X/Y/Z components
> +// consume X/Y components in location 1

This should be:

    // consume X/Y/Z/W components in location 0
    // consume X/Y components in location 1

>   layout(location = 0) flat in dvec3 a_to_fs;
>   
> -// consumes W component
> +// consume Z/W components
>   layout(location = 1, component = 2) flat in double b_to_fs;
>   
>   void main()
> diff --git a/tests/spec/arb_enhanced_layouts/execution/component-layout/vs-tcs-tes-fs-double.shader_test b/tests/spec/arb_enhanced_layouts/execution/component-layout/vs-tcs-tes-fs-double.shader_test
> index 938d2703d..196729aab 100644
> --- a/tests/spec/arb_enhanced_layouts/execution/component-layout/vs-tcs-tes-fs-double.shader_test
> +++ b/tests/spec/arb_enhanced_layouts/execution/component-layout/vs-tcs-tes-fs-double.shader_test
> @@ -15,13 +15,16 @@ GL_ARB_gpu_shader_fp64
>   
>   in vec4 vertex;
>   
> -// consume Y/Z/W components
> +// consume also X/Y components in location 1

This should be:

    // consume X/Y/Z/W components in location 0
    // consume X/Y components in location 1

>   layout(location = 0) flat out dvec3 a;
>   
> -// consumes X component
> +// consume Z/W components
>   layout(location = 1, component = 2) flat out double b;
>   
> +// consume X/Y components
>   layout(location = 2, component = 0) flat out double c;
> +
> +// consume Z/W components
>   layout(location = 2, component = 2) flat out double d;
>   
>   void main()
> @@ -44,22 +47,28 @@ void main()
>   
>   layout(vertices = 3) out;
>   
> -// consume Y/Z/W components
> +// consume also X/Y components in location 1

This should be:

    // consume X/Y/Z/W components in location 0
    // consume X/Y components in location 1


>   layout(location = 0) flat in dvec3 a[];
>   
> -// consumes X component
> +// consume Z/W components
>   layout(location = 1, component = 2) flat in double b[];
>   
> +// consume X/Y components
>   layout(location = 2, component = 0) flat in double c[];
> +
> +// consume Z/W components
>   layout(location = 2, component = 2) flat in double d[];
>   
> -// consume Y/Z/W components
> +// consume also X/Y components in location 1

This should be:

    // consume X/Y/Z/W components in location 0
    // consume X/Y components in location 1


>   layout(location = 0) flat out dvec3 a_tcs[];
>   
> -// consumes X component
> +// consume Z/W components
>   layout(location = 1, component = 2) flat out double b_tcs[];
>   
> +// consume X/Y components
>   layout(location = 2, component = 0) flat out double c_tcs[];
> +
> +// consume Z/W components
>   layout(location = 2, component = 2) flat out double d_tcs[];
>   
>   void main() {
> @@ -82,22 +91,28 @@ void main() {
>   
>   layout(triangles) in;
>   
> -// consume Y/Z/W components
> +// consume also X/Y components in location 1

This should be:

    // consume X/Y/Z/W components in location 0
    // consume X/Y components in location 1


>   layout(location = 0) flat in dvec3 a_tcs[];
>   
> -// consumes X component
> +// consume Z/W components
>   layout(location = 1, component = 2) flat in double b_tcs[];
>   
> +// consume X/Y components
>   layout(location = 2, component = 0) flat in double c_tcs[];
> +
> +// consume Z/W components
>   layout(location = 2, component = 2) flat in double d_tcs[];
>   
> -// consume Y/Z/W components
> +// consume also X/Y components in location 1

This should be:

    // consume X/Y/Z/W components in location 0
    // consume X/Y components in location 1

>   layout(location = 0) flat out dvec3 a_tes;
>   
> -// consumes X component
> +// consume Z/W components
>   layout(location = 1, component = 2) flat out double b_tes;
>   
> +// consume X/Y components
>   layout(location = 2, component = 0) flat out double c_tes;
> +
> +// consume Z/W components
>   layout(location = 2, component = 2) flat out double d_tes;
>   
>   void main() {
> @@ -119,13 +134,16 @@ void main() {
>   
>   out vec4 color;
>   
> -// consume Y/Z/W components
> +// consume also X/Y components in location 1

This should be:

    // consume X/Y/Z/W components in location 0
    // consume X/Y components in location 1

With all these fixed:

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>


>   layout(location = 0) flat in dvec3 a_tes;
>   
> -// consumes X component
> +// consume Z/W components
>   layout(location = 1, component = 2) flat in double b_tes;
>   
> +// consume X/Y components
>   layout(location = 2, component = 0) flat in double c_tes;
> +
> +// consume Z/W components
>   layout(location = 2, component = 2) flat in double d_tes;
>   
>   void main()
> diff --git a/tests/spec/arb_enhanced_layouts/linker/component-layout/vs-to-fs-type-mismatch-double-float.shader_test b/tests/spec/arb_enhanced_layouts/linker/component-layout/vs-to-fs-type-mismatch-double-float.shader_test
> index 7e51c4ccc..1f822c025 100644
> --- a/tests/spec/arb_enhanced_layouts/linker/component-layout/vs-to-fs-type-mismatch-double-float.shader_test
> +++ b/tests/spec/arb_enhanced_layouts/linker/component-layout/vs-to-fs-type-mismatch-double-float.shader_test
> @@ -27,7 +27,7 @@ GL_ARB_gpu_shader_fp64
>   // consume X/Y components
>   layout(location = 7, component = 0) flat out double a;
>   
> -// consumes Y component
> +// consumes Z component
>   layout(location = 7, component = 2) out float b;
>   
>   void main()
> @@ -47,7 +47,7 @@ out vec4 color;
>   // consume X/Y components
>   layout(location = 7, component = 0) flat in double a;
>   
> -// consumes Y component
> +// consumes Z component
>   layout(location = 7, component = 2) in float b;
>   
>   void main()
> diff --git a/tests/spec/arb_enhanced_layouts/linker/component-layout/vs-to-fs-type-mismatch-signed-float.shader_test b/tests/spec/arb_enhanced_layouts/linker/component-layout/vs-to-fs-type-mismatch-signed-float.shader_test
> index 8c6219823..0bc933452 100644
> --- a/tests/spec/arb_enhanced_layouts/linker/component-layout/vs-to-fs-type-mismatch-signed-float.shader_test
> +++ b/tests/spec/arb_enhanced_layouts/linker/component-layout/vs-to-fs-type-mismatch-signed-float.shader_test
> @@ -41,10 +41,10 @@ void main()
>   
>   out vec4 color;
>   
> -// consume Y/Z/W components of 32 vectors
> +// consume X/Y/Z components
>   layout(location = 0) flat in ivec3 a;
>   
> -// consumes X component of first vector
> +// consumes W component
>   layout(location = 0, component = 3) flat in float b;
>   
>   void main()
> diff --git a/tests/spec/arb_enhanced_layouts/linker/component-layout/vs-to-fs-type-mismatch-signed-unsigned.shader_test b/tests/spec/arb_enhanced_layouts/linker/component-layout/vs-to-fs-type-mismatch-signed-unsigned.shader_test
> index 62bd8efba..34d1138cd 100644
> --- a/tests/spec/arb_enhanced_layouts/linker/component-layout/vs-to-fs-type-mismatch-signed-unsigned.shader_test
> +++ b/tests/spec/arb_enhanced_layouts/linker/component-layout/vs-to-fs-type-mismatch-signed-unsigned.shader_test
> @@ -41,10 +41,10 @@ void main()
>   
>   out vec4 color;
>   
> -// consume Y/Z/W components of 32 vectors
> +// consume X/Y/Z components
>   layout(location = 0) flat in ivec3 a;
>   
> -// consumes X component of first vector
> +// consumes W component
>   layout(location = 0, component = 3) flat in uint b;
>   
>   void main()
> diff --git a/tests/spec/arb_enhanced_layouts/linker/component-layout/vs-to-fs-type-mismatch-unsigned-float.shader_test b/tests/spec/arb_enhanced_layouts/linker/component-layout/vs-to-fs-type-mismatch-unsigned-float.shader_test
> index 1d847232f..39c37f6ac 100644
> --- a/tests/spec/arb_enhanced_layouts/linker/component-layout/vs-to-fs-type-mismatch-unsigned-float.shader_test
> +++ b/tests/spec/arb_enhanced_layouts/linker/component-layout/vs-to-fs-type-mismatch-unsigned-float.shader_test
> @@ -41,10 +41,10 @@ void main()
>   
>   out vec4 color;
>   
> -// consume Y/Z/W components of 32 vectors
> +// consume X/Y/Z components
>   layout(location = 0) flat in uvec3 a;
>   
> -// consumes X component of first vector
> +// consumes W component
>   layout(location = 0, component = 3) flat in float b;
>   
>   void main()
>