[Piglit] [PATCH 2/2] shader_runner: Allow geometry and tessellation shaders in OpenGLES 3.2

Jordan Justen jordan.l.justen at intel.com
Thu Nov 5 10:44:43 PST 2015


Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
---
 tests/shaders/shader_runner.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/tests/shaders/shader_runner.c b/tests/shaders/shader_runner.c
index 17a3e3a..764f46d 100644
--- a/tests/shaders/shader_runner.c
+++ b/tests/shaders/shader_runner.c
@@ -357,11 +357,21 @@ compile_glsl(GLenum target)
 		break;
 	case GL_TESS_CONTROL_SHADER:
 	case GL_TESS_EVALUATION_SHADER:
-		if (gl_version.num < 40)
+		if (gl_version.es) {
+			if (gl_version.num < 32) {
+				printf("OpenGLES 3.2 is required for tessellation shader support\n");
+				piglit_report_result(PIGLIT_SKIP);
+			}
+		} else if (gl_version.num < 40)
 			piglit_require_extension("GL_ARB_tessellation_shader");
 		break;
 	case GL_GEOMETRY_SHADER:
-		if (gl_version.num < 32)
+		if (gl_version.es) {
+			if (gl_version.num < 32) {
+				printf("OpenGLES 3.2 is required for geometry shader support\n");
+				piglit_report_result(PIGLIT_SKIP);
+			}
+		} else if (gl_version.num < 32)
 			piglit_require_extension("GL_ARB_geometry_shader4");
 		break;
 	case GL_COMPUTE_SHADER:
-- 
2.6.2



More information about the Piglit mailing list