[Piglit] [PATCH 13/17] egl_khr_create_context: Verify that the attributes list pointer can be NULL for Desktop GL

Matt Turner mattst88 at gmail.com
Thu Aug 16 10:51:04 PDT 2012


---
 tests/all_egl.tests                                |    1 +
 .../spec/egl_khr_create_context/CMakeLists.gl.txt  |    1 +
 .../valid-attribute-null-gl.c                      |   85 ++++++++++++++++++++
 3 files changed, 87 insertions(+), 0 deletions(-)
 create mode 100644 tests/egl/spec/egl_khr_create_context/valid-attribute-null-gl.c

diff --git a/tests/all_egl.tests b/tests/all_egl.tests
index e0b1772..df2d590 100644
--- a/tests/all_egl.tests
+++ b/tests/all_egl.tests
@@ -25,6 +25,7 @@ create_context['default minor version GLES'] = plain_test('egl-create-context-de
 create_context['valid attribute empty GLES'] = plain_test('egl-create-context-valid-attribute-empty-gles')
 create_context['valid attribute empty GL'] = plain_test('egl-create-context-valid-attribute-empty-gl')
 create_context['NULL valid attribute GLES'] = plain_test('egl-create-context-valid-attribute-null-gles')
+create_context['NULL valid attribute GL'] = plain_test('egl-create-context-valid-attribute-null-gl')
 create_context['invalid OpenGL version'] = plain_test('egl-create-context-invalid-gl-version')
 create_context['invalid attribute GL'] = plain_test('egl-create-context-invalid-attribute-gl')
 create_context['invalid flag GL'] = plain_test('egl-create-context-invalid-flag-gl')
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 18484fa..39e06ba 100644
--- a/tests/egl/spec/egl_khr_create_context/CMakeLists.gl.txt
+++ b/tests/egl/spec/egl_khr_create_context/CMakeLists.gl.txt
@@ -16,6 +16,7 @@ piglit_add_executable (egl-create-context-default-minor-version-gles default-min
 piglit_add_executable (egl-create-context-valid-attribute-empty-gles valid-attribute-empty-gles.c common.c)
 piglit_add_executable (egl-create-context-valid-attribute-empty-gl valid-attribute-empty-gl.c common.c)
 piglit_add_executable (egl-create-context-valid-attribute-null-gles valid-attribute-null-gles.c common.c)
+piglit_add_executable (egl-create-context-valid-attribute-null-gl valid-attribute-null-gl.c common.c)
 piglit_add_executable (egl-create-context-invalid-gl-version invalid-gl-version.c common.c)
 piglit_add_executable (egl-create-context-invalid-attribute-gl invalid-attribute-gl.c common.c)
 piglit_add_executable (egl-create-context-invalid-flag-gl invalid-flag-gl.c common.c)
diff --git a/tests/egl/spec/egl_khr_create_context/valid-attribute-null-gl.c b/tests/egl/spec/egl_khr_create_context/valid-attribute-null-gl.c
new file mode 100644
index 0000000..7db99fe
--- /dev/null
+++ b/tests/egl/spec/egl_khr_create_context/valid-attribute-null-gl.c
@@ -0,0 +1,85 @@
+/* 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)
+{
+	const char *version_string;
+	int major;
+	int minor;
+
+	if (!EGL_KHR_create_context_setup(EGL_OPENGL_BIT)) {
+		fprintf(stderr, "Desktop GL not available.\n");
+		piglit_report_result(PIGLIT_SKIP);
+	}
+	eglBindAPI(EGL_OPENGL_API);
+
+	/* The EGL 1.4 spec says:
+	 *
+	 *     "attrib list may be NULL or empty (first attribute is EGL_NONE),
+	 *     in which case all the attributes assume their default values"
+	 *
+	 * Specify a NULL attrib_list and expect to receive an ES 1.x context.
+	 */
+	ctx = eglCreateContext(egl_dpy, cfg, EGL_NO_CONTEXT, NULL);
+	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 ((major < 1 || major > 3) ||
+	    (major == 1 && (minor < 2 || minor > 5)) ||
+	    (major == 2 && (minor < 0 || minor > 1)) ||
+	    (major == 3 && minor != 0)) {
+		fprintf(stderr,
+			"Unexpected Desktop GL version: %s\n"
+			"Expected GL 1.2-1.5, 2.0, 2.1, or 3.0.\n",
+			version_string);
+		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



More information about the Piglit mailing list