summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2019-03-08 17:20:20 -0800
committerIan Romanick <ian.d.romanick@intel.com>2019-06-26 08:31:49 -0700
commitcc4d113ec0ec0b61a37261502c4654b346b9fa43 (patch)
tree523ec78903e165659c8f8cf2127e73dedabe1081
parent8dfcae9e51520107888f0dad87d21a054690740e (diff)
glsl-1.30: Replace open-coded version of piglit_require_GLSL_version()
-rw-r--r--tests/spec/glsl-1.30/linker/clipping/mixing-clip-distance-and-clip-vertex-disallowed.c16
1 files changed, 1 insertions, 15 deletions
diff --git a/tests/spec/glsl-1.30/linker/clipping/mixing-clip-distance-and-clip-vertex-disallowed.c b/tests/spec/glsl-1.30/linker/clipping/mixing-clip-distance-and-clip-vertex-disallowed.c
index 7ef2a3e38..9ae264110 100644
--- a/tests/spec/glsl-1.30/linker/clipping/mixing-clip-distance-and-clip-vertex-disallowed.c
+++ b/tests/spec/glsl-1.30/linker/clipping/mixing-clip-distance-and-clip-vertex-disallowed.c
@@ -73,24 +73,10 @@ piglit_display(void)
void
piglit_init(int argc, char **argv)
{
- const char *glsl_version_string;
- float glsl_version;
GLint ok;
GLuint prog;
-
- piglit_require_GLSL();
-
- glsl_version_string = (char *)
- glGetString(GL_SHADING_LANGUAGE_VERSION);
- glsl_version = (glsl_version_string == NULL)
- ? 0.0 : strtod(glsl_version_string, NULL);
- if (glsl_version <= 1.299999) {
- printf("Test requires GLSL version >= 1.3. "
- "Actual version is %.1f.\n",
- glsl_version);
- piglit_report_result(PIGLIT_SKIP);
- }
+ piglit_require_GLSL_version(130);
prog = piglit_build_simple_program_unlinked(vert, frag);
glLinkProgram(prog);