summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTapani Pälli <tapani.palli@intel.com>2019-11-25 10:53:29 +0200
committerTapani Pälli <tapani.palli@intel.com>2019-11-25 10:59:44 +0200
commita98e79c135a68d2a9bd9314402f9f480c969fef0 (patch)
tree397d3069f62b7f1369184808558c4ab75f7bdb82
parent196b7197583bca379c5e66c62dc1cc415b30ce70 (diff)
arb_program_interface_query: add gl_PerVertex redeclarationsso-changes
From Section 7.4 (Program Pipeline Objects) of the OpenGL 4.6 Core spec: "To use any built-in input or output in the gl_PerVertex and gl_PerFragment blocks in separable program objects, shader code must redeclare those blocks prior to use." This fixes linking errors with upcoming Mesa changes that implement the checks for builtin interface redeclarations. Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
-rwxr-xr-xtests/spec/arb_program_interface_query/common.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/tests/spec/arb_program_interface_query/common.h b/tests/spec/arb_program_interface_query/common.h
index 3e3a6e905..376b93455 100755
--- a/tests/spec/arb_program_interface_query/common.h
+++ b/tests/spec/arb_program_interface_query/common.h
@@ -94,6 +94,9 @@ const char gs_std[] =
"in gl_PerVertex {\n"
" vec4 gl_Position;\n"
"} gl_in[];\n"
+ "out gl_PerVertex {\n"
+ " vec4 gl_Position;\n"
+ "};\n"
"in vec4 vs_output1[3];\n"
"out vec4 fs_input1;\n"
"void main() {\n"
@@ -186,6 +189,9 @@ static const char gs_stor[] =
"layout(triangle_strip, max_vertices = 6) out;\n"
"buffer gs_buffer_block { vec4 gs_buf_var; };"
"in vec4 vs_output1[3];\n"
+ "out gl_PerVertex {\n"
+ " vec4 gl_Position;\n"
+ "};\n"
"void main() {\n"
" for (int i = 0; i < 6; i++) {\n"
" gl_Position = vs_output1[i % 3] * gs_buf_var;\n"
@@ -303,6 +309,9 @@ static const char gs_sub[] =
"in gl_PerVertex {\n"
" vec4 gl_Position;\n"
"} gl_in[];\n"
+ "out gl_PerVertex {\n"
+ " vec4 gl_Position;\n"
+ "};\n"
"in vec4 vs_output1[3];\n"
"void main() {\n"
" for (int i = 0; i < 6; i++) {\n"