[Piglit] [PATCH 2/6] shader_runner: Allow SSO in OpenGL ES too

[Ian Romanick]

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

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
---
 tests/shaders/shader_runner.c | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/tests/shaders/shader_runner.c b/tests/shaders/shader_runner.c
index 0d7b593..2dc0d9b 100644
--- a/tests/shaders/shader_runner.c
+++ b/tests/shaders/shader_runner.c
@@ -130,7 +130,7 @@ static GLuint sso_tess_eval_prog;
 static GLuint sso_geometry_prog;
 static GLuint sso_fragment_prog;
 static GLuint sso_compute_prog;
-static GLuint pipeline;
+static GLuint pipeline = 0;
 static size_t num_vbo_rows = 0;
 static bool vbo_present = false;
 static bool link_ok = false;
@@ -882,10 +882,19 @@ process_requirement(const char *line)
 
 		piglit_set_rlimit(lim);
 	}  else if (string_match("SSO", line)) {
+		const char *const ext_name = gl_version.es
+			? "GL_EXT_separate_shader_objects"
+			: "GL_ARB_separate_shader_objects";
+		const unsigned min_version = gl_version.es
+			? 31 : 41;
+
 		line = eat_whitespace(line + 3);
 		if (string_match("ENABLED", line)) {
-			piglit_require_extension("GL_ARB_separate_shader_objects");
+			if (gl_version.num < min_version)
+				piglit_require_extension(ext_name);
+
 			sso_in_use = true;
+			glGenProgramPipelines(1, &pipeline);
 		}
 	}
 }
@@ -3377,10 +3386,9 @@ piglit_display(void)
 			if (!sso_in_use)
 				glDeleteProgramsARB(1, &prog);
 		}
-#ifdef PIGLIT_USE_OPENGL
-		if (piglit_is_extension_supported("GL_ARB_separate_shader_objects"))
+
+		if (pipeline != 0)
 			glDeleteProgramPipelines(1, &pipeline);
-#endif
 	}
 
 	return result;
@@ -3424,9 +3432,6 @@ piglit_init(int argc, char **argv)
 		glGetIntegerv(GL_MAX_VARYING_COMPONENTS,
 			      &gl_max_varying_components);
 	glGetIntegerv(GL_MAX_CLIP_PLANES, &gl_max_clip_planes);
-
-	if (piglit_is_extension_supported("GL_ARB_separate_shader_objects"))
-		glGenProgramPipelines(1, &pipeline);
 #else
 	glGetIntegerv(GL_MAX_FRAGMENT_UNIFORM_VECTORS,
 		      &gl_max_fragment_uniform_components);
-- 
2.5.5