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

Jordan Justen jordan.l.justen at intel.com
Thu Nov 5 12:00:08 PST 2015


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

diff --git a/tests/shaders/shader_runner.c b/tests/shaders/shader_runner.c
index 59a76fa..b010cbb 100644
--- a/tests/shaders/shader_runner.c
+++ b/tests/shaders/shader_runner.c
@@ -357,12 +357,16 @@ compile_glsl(GLenum target)
 		break;
 	case GL_TESS_CONTROL_SHADER:
 	case GL_TESS_EVALUATION_SHADER:
-		if (gl_version.num < 40)
-			piglit_require_extension("GL_ARB_tessellation_shader");
+		if (gl_version.num < (gl_version.es ? 32 : 40))
+			piglit_require_extension(gl_version.es ?
+						 "GL_OES_tessellation_shader" :
+						 "GL_ARB_tessellation_shader");
 		break;
 	case GL_GEOMETRY_SHADER:
 		if (gl_version.num < 32)
-			piglit_require_extension("GL_ARB_geometry_shader4");
+			piglit_require_extension(gl_version.es ?
+						 "GL_OES_geometry_shader" :
+						 "GL_ARB_geometry_shader4");
 		break;
 	case GL_COMPUTE_SHADER:
 		if (gl_version.num < (gl_version.es ? 31 : 43))
-- 
2.6.2



More information about the Piglit mailing list