[Piglit] [PATCH 2/3] arb_program_interface_query: Expect array suffixes on array inputs / outputs

Ian Romanick idr at freedesktop.org
Wed May 25 22:36:15 UTC 2016


From: Ian Romanick <ian.d.romanick at intel.com>

The ARB_program_interface_query spec says:

   * For an active variable declared as an array of basic types, a single
     entry will be generated, with its name string formed by concatenating
     the name of the array and the string "[0]".

I can find no language that implies that geometry or tessellation inputs
or tessellation control outputs should be excluded from this rule.
Various dEQP tests also expect [0] be added to geometry shader inputs.

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Cc: Martin Peres <martin.peres at linux.intel.com>
Cc: Dave Airlie <airlied at redhat.com>
---
 tests/spec/arb_program_interface_query/resource-query.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/spec/arb_program_interface_query/resource-query.c b/tests/spec/arb_program_interface_query/resource-query.c
index d249e1b..d16c092 100755
--- a/tests/spec/arb_program_interface_query/resource-query.c
+++ b/tests/spec/arb_program_interface_query/resource-query.c
@@ -208,15 +208,15 @@ static const char *st_r_tess_uniform_block[] = {"tcs_uniform_block",
 						"tes_uniform_block", NULL};
 static const char *st_r_cs_uniform_block[] = {"cs_uniform_block", NULL};
 static const char *st_r_in_vs[] = {"vs_input0", "vs_input1", NULL};
-static const char *st_r_in_gs[] = {"gs_input", "gl_PerVertex.gl_Position", NULL};
+static const char *st_r_in_gs[] = {"gs_input[0]", "gl_PerVertex.gl_Position", NULL};
 static const char *st_r_in_fs[] = {"fs_input1", NULL};
-static const char *st_r_in_tes[] = {"tes_input", "gl_PerVertex.gl_Position", NULL};
-static const char *st_r_in_tcs[] = {"tcs_input", "gl_PerVertex.gl_Position", NULL};
+static const char *st_r_in_tes[] = {"tes_input[0]", "gl_PerVertex.gl_Position", NULL};
+static const char *st_r_in_tcs[] = {"tcs_input[0]", "gl_PerVertex.gl_Position", NULL};
 static const char *st_r_out_vs[] = {"gl_Position", NULL};
 static const char *st_r_out_gs[] = {"gs_output0", "gl_Position", NULL};
 static const char *st_r_out_fs[] = {"fs_output0", "fs_output1", NULL};
 static const char *st_r_out_tes[] = {"tes_output[0]", "gl_Position", NULL};
-static const char *st_r_out_tcs[] = {"tcs_output", "tcs_patch",
+static const char *st_r_out_tcs[] = {"tcs_output[0]", "tcs_patch",
 				     "gl_PerVertex.gl_Position",
 				     "gl_PerVertex.gl_BackColor",
 				     "gl_PerVertex.gl_BackSecondaryColor",
-- 
2.5.5



More information about the Piglit mailing list