[Piglit] [PATCH v2 05/17] egl_khr_create_context: Verify default minor version is 0 for GLES

[Matt Turner]

v2: - Try for EGL_OPENGL_ES_BIT renderable type, and if it fails try
      EGL_OPENGL_ES2_BIT renderable type.
---
 tests/all_egl.tests                                |    1 +
 .../spec/egl_khr_create_context/CMakeLists.gl.txt  |    1 +
 .../default-minor-version-gles.c                   |   92 ++++++++++++++++++++
 3 files changed, 94 insertions(+), 0 deletions(-)
 create mode 100644 tests/egl/spec/egl_khr_create_context/default-minor-version-gles.c

diff --git a/tests/all_egl.tests b/tests/all_egl.tests
index c5e8d94..a3b7f32 100644
--- a/tests/all_egl.tests
+++ b/tests/all_egl.tests
@@ -21,3 +21,4 @@ egl['egl-query-surface-EGL_WIDTH'] = plain_test('egl-query-surface --attr=EGL_WI
 create_context = Group();
 egl['EGL_KHR_create_context'] = create_context
 create_context['default major version GLES'] = plain_test('egl-create-context-default-major-version-gles')
+create_context['default minor version GLES'] = plain_test('egl-create-context-default-minor-version-gles')
diff --git a/tests/egl/spec/egl_khr_create_context/CMakeLists.gl.txt b/tests/egl/spec/egl_khr_create_context/CMakeLists.gl.txt
index 3f19c3b..b9d5e80 100644
--- a/tests/egl/spec/egl_khr_create_context/CMakeLists.gl.txt
+++ b/tests/egl/spec/egl_khr_create_context/CMakeLists.gl.txt
@@ -12,5 +12,6 @@ link_libraries (
 )
 
 piglit_add_executable (egl-create-context-default-major-version-gles default-major-version-gles.c common.c)
+piglit_add_executable (egl-create-context-default-minor-version-gles default-minor-version-gles.c common.c)
 
 # vim: ft=cmake:
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
new file mode 100644
index 0000000..2331832
--- /dev/null
+++ b/tests/egl/spec/egl_khr_create_context/default-minor-version-gles.c
@@ -0,0 +1,92 @@
+/* Copyright © 2012 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+#include "piglit-util-gl-common.h"
+#include "common.h"
+
+int main(int argc, char **argv)
+{
+	EGLint attribs[] = {
+		EGL_CONTEXT_MAJOR_VERSION_KHR, 1,
+		EGL_NONE
+	};
+	const char *version_string;
+	int major;
+	int minor;
+
+	if (!EGL_KHR_create_context_setup(EGL_OPENGL_ES_BIT)) {
+		fprintf(stderr, "ES 1 not available, trying ES 2.\n");
+		attribs[1] = 2;
+		if (!EGL_KHR_create_context_setup(EGL_OPENGL_ES2_BIT)) {
+			fprintf(stderr, "ES 2 not available.\n");
+			piglit_report_result(PIGLIT_SKIP);
+		}
+	}
+
+	/* The EGL_KHR_create_context spec says:
+	 *
+	 *     "The default values for EGL_CONTEXT_MAJOR_VERSION_KHR and
+	 *     EGL_CONTEXT_MINOR_VERSION_KHR are 1 and 0 respectively."
+	 *
+	 * Request an OpenGL ES 1.x or 2.0 context by explicitly setting the
+	 * major version and leaving the minor version at the default value of
+	 * 0.
+	 */
+	ctx = eglCreateContext(egl_dpy, cfg, EGL_NO_CONTEXT, attribs);
+	if (ctx == EGL_NO_CONTEXT) {
+		fprintf(stderr, "eglCreateContext() failed\n");
+		piglit_report_result(PIGLIT_FAIL);
+	}
+
+	if (!eglMakeCurrent(egl_dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, ctx)) {
+		fprintf(stderr, "eglMakeCurrent() failed\n");
+		piglit_report_result(PIGLIT_FAIL);
+	}
+
+	piglit_dispatch_default_init();
+
+	version_string = (char *) glGetString(GL_VERSION);
+
+	if (!parse_version_string(version_string, &major, &minor)) {
+		fprintf(stderr,
+			"Unable to parse GL version string: %s\n",
+			version_string);
+		piglit_report_result(PIGLIT_FAIL);
+	}
+
+	if (!version_is_valid_for_context(attribs[1], major, minor)) {
+		fprintf(stderr,
+			"Unexpected GLES version: %s\n"
+			"Expected ES %s.\n",
+			version_string,
+			attribs[1] == 1 ? "1.0 or 1.1" : "2.0 or 3.0");
+		piglit_report_result(PIGLIT_FAIL);
+	}
+
+	eglMakeCurrent(egl_dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+	eglDestroyContext(egl_dpy, ctx);
+
+	EGL_KHR_create_context_teardown();
+
+	piglit_report_result(PIGLIT_PASS);
+
+	return EXIT_SUCCESS;
+}
-- 
1.7.8.6