[Piglit] [PATCH 7/8] arb_shader_draw_parameters: require GLSL 3.30
Marek Olšák
maraeo at gmail.com
Mon Apr 10 21:01:42 UTC 2017
From: Marek Olšák <marek.olsak at amd.com>
---
tests/spec/arb_shader_draw_parameters/basevertex.c | 2 +-
tests/spec/arb_shader_draw_parameters/drawid-indirect.c | 2 +-
tests/spec/arb_shader_draw_parameters/drawid.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/spec/arb_shader_draw_parameters/basevertex.c b/tests/spec/arb_shader_draw_parameters/basevertex.c
index 1b2181e..2279e0f 100644
--- a/tests/spec/arb_shader_draw_parameters/basevertex.c
+++ b/tests/spec/arb_shader_draw_parameters/basevertex.c
@@ -82,21 +82,21 @@ piglit_init(int argc, char **argv)
(void)!asprintf(&vs_text, vs_template,
"ref.xy == ivec2(gl_BaseVertexARB, gl_BaseInstanceARB)");
} else if (strcmp(argv[1], "vertexid-zerobased") == 0) {
(void)!asprintf(&vs_text, vs_template,
"ref.z == gl_VertexID - gl_BaseVertexARB");
} else {
printf("Unknown subtest: %s\n", argv[1]);
piglit_report_result(PIGLIT_FAIL);
}
- piglit_require_GLSL_version(130);
+ piglit_require_GLSL_version(330);
piglit_require_extension("GL_ARB_shader_draw_parameters");
piglit_require_extension("GL_ARB_base_instance");
prog = piglit_build_simple_program(vs_text, fs_text);
glUseProgram(prog);
}
enum piglit_result
diff --git a/tests/spec/arb_shader_draw_parameters/drawid-indirect.c b/tests/spec/arb_shader_draw_parameters/drawid-indirect.c
index 0b58176..e27591c 100644
--- a/tests/spec/arb_shader_draw_parameters/drawid-indirect.c
+++ b/tests/spec/arb_shader_draw_parameters/drawid-indirect.c
@@ -92,21 +92,21 @@ piglit_init(int argc, char **argv)
(void)!asprintf(&vs_text, vs_template,
"ref.xz == ivec2(gl_DrawIDARB, gl_BaseInstanceARB)");
} else if (strcmp(argv[1], "vertexid") == 0) {
(void)!asprintf(&vs_text, vs_template,
"ref.w == gl_VertexID");
} else {
printf("Unknown subtest: %s\n", argv[1]);
piglit_report_result(PIGLIT_FAIL);
}
- piglit_require_GLSL_version(130);
+ piglit_require_GLSL_version(330);
piglit_require_extension("GL_ARB_shader_draw_parameters");
piglit_require_extension("GL_ARB_base_instance");
prog = piglit_build_simple_program(vs_text, fs_text);
glUseProgram(prog);
}
struct cmd {
diff --git a/tests/spec/arb_shader_draw_parameters/drawid.c b/tests/spec/arb_shader_draw_parameters/drawid.c
index fa8d797..b3a26e1 100644
--- a/tests/spec/arb_shader_draw_parameters/drawid.c
+++ b/tests/spec/arb_shader_draw_parameters/drawid.c
@@ -74,21 +74,21 @@ piglit_init(int argc, char **argv)
(void)!asprintf(&vs_text, vs_template,
"ref.x == gl_DrawIDARB");
} else if (strcmp(argv[1], "vertexid") == 0) {
(void)!asprintf(&vs_text, vs_template,
"ref.x == gl_DrawIDARB && ref.y == gl_VertexID");
} else {
printf("Unknown subtest: %s\n", argv[1]);
piglit_report_result(PIGLIT_FAIL);
}
- piglit_require_GLSL_version(130);
+ piglit_require_GLSL_version(330);
piglit_require_extension("GL_ARB_shader_draw_parameters");
piglit_require_extension("GL_ARB_base_instance");
prog = piglit_build_simple_program(vs_text, fs_text);
glUseProgram(prog);
}
enum piglit_result
--
2.7.4
More information about the Piglit
mailing list