[Piglit] [PATCH 10/14] egl_khr_create_context: use ES1 dispatch

[Marek Olšák]

From: Daniel Kurtz <djkurtz at chromium.org>

Using ES1 dispatch works now, so let's use it for gles tests.

Signed-off-by: Daniel Kurtz <djkurtz at chromium.org>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
---
 tests/egl/spec/egl_khr_create_context/default-major-version-gles.c | 3 +--
 tests/egl/spec/egl_khr_create_context/default-minor-version-gles.c | 3 +--
 tests/egl/spec/egl_khr_create_context/valid-attribute-empty-gles.c | 3 +--
 tests/egl/spec/egl_khr_create_context/valid-attribute-null-gles.c  | 3 +--
 tests/egl/spec/egl_khr_create_context/valid-flag-debug.c           | 7 +------
 5 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/tests/egl/spec/egl_khr_create_context/default-major-version-gles.c b/tests/egl/spec/egl_khr_create_context/default-major-version-gles.c
index a6af4b1..03e16a9 100644
--- a/tests/egl/spec/egl_khr_create_context/default-major-version-gles.c
+++ b/tests/egl/spec/egl_khr_create_context/default-major-version-gles.c
@@ -60,8 +60,7 @@ int main(int argc, char **argv)
 		piglit_report_result(PIGLIT_FAIL);
 	}
 
-	/* FINISHME: Use PIGLIT_DISPATCH_ES1 when implemented. */
-	piglit_dispatch_default_init(PIGLIT_DISPATCH_GL);
+	piglit_dispatch_default_init(PIGLIT_DISPATCH_ES1);
 
 	version_string = (char *) glGetString(GL_VERSION);
 
diff --git a/tests/egl/spec/egl_khr_create_context/default-minor-version-gles.c b/tests/egl/spec/egl_khr_create_context/default-minor-version-gles.c
index e35526a..4fb8e69 100644
--- a/tests/egl/spec/egl_khr_create_context/default-minor-version-gles.c
+++ b/tests/egl/spec/egl_khr_create_context/default-minor-version-gles.c
@@ -65,8 +65,7 @@ int main(int argc, char **argv)
 	}
 
 	if (attribs[1] == 1) {
-		/* FINISHME: Use PIGLIT_DISPATCH_ES1 when implemented. */
-		piglit_dispatch_default_init(PIGLIT_DISPATCH_GL);
+		piglit_dispatch_default_init(PIGLIT_DISPATCH_ES1);
 	} else if (attribs[1] == 2) {
 		piglit_dispatch_default_init(PIGLIT_DISPATCH_ES2);
 	}
diff --git a/tests/egl/spec/egl_khr_create_context/valid-attribute-empty-gles.c b/tests/egl/spec/egl_khr_create_context/valid-attribute-empty-gles.c
index f370112..b1766cf 100644
--- a/tests/egl/spec/egl_khr_create_context/valid-attribute-empty-gles.c
+++ b/tests/egl/spec/egl_khr_create_context/valid-attribute-empty-gles.c
@@ -54,8 +54,7 @@ int main(int argc, char **argv)
 		piglit_report_result(PIGLIT_FAIL);
 	}
 
-	/* FINISHME: Use PIGLIT_DISPATCH_ES1 when implemented. */
-	piglit_dispatch_default_init(PIGLIT_DISPATCH_GL);
+	piglit_dispatch_default_init(PIGLIT_DISPATCH_ES1);
 
 	version_string = (char *) glGetString(GL_VERSION);
 
diff --git a/tests/egl/spec/egl_khr_create_context/valid-attribute-null-gles.c b/tests/egl/spec/egl_khr_create_context/valid-attribute-null-gles.c
index 4759702..a4b5fde 100644
--- a/tests/egl/spec/egl_khr_create_context/valid-attribute-null-gles.c
+++ b/tests/egl/spec/egl_khr_create_context/valid-attribute-null-gles.c
@@ -51,8 +51,7 @@ int main(int argc, char **argv)
 		piglit_report_result(PIGLIT_FAIL);
 	}
 
-	/* FINISHME: Use PIGLIT_DISPATCH_ES1 when implemented. */
-	piglit_dispatch_default_init(PIGLIT_DISPATCH_GL);
+	piglit_dispatch_default_init(PIGLIT_DISPATCH_ES1);
 
 	version_string = (char *) glGetString(GL_VERSION);
 
diff --git a/tests/egl/spec/egl_khr_create_context/valid-flag-debug.c b/tests/egl/spec/egl_khr_create_context/valid-flag-debug.c
index 2703335..31f7398 100644
--- a/tests/egl/spec/egl_khr_create_context/valid-flag-debug.c
+++ b/tests/egl/spec/egl_khr_create_context/valid-flag-debug.c
@@ -120,12 +120,7 @@ try_debug_flag(EGLenum context_api, EGLenum context_bit)
 		dispatch_api = PIGLIT_DISPATCH_GL;
 		break;
 	case EGL_OPENGL_ES_BIT:
-		/* Piglit doesn't yet have ES1 dispatch, so just initialize
-		 * with ES2 dispatch. This should be safe because the only
-		 * GL functions called by this test are glGetString() and
-		 * glGetIntegerv().
-		 */
-		dispatch_api = PIGLIT_DISPATCH_ES2;
+		dispatch_api = PIGLIT_DISPATCH_ES1;
 		break;
 	case EGL_OPENGL_ES2_BIT:
 	case EGL_OPENGL_ES3_BIT_KHR:
-- 
2.1.0