v2: - Ask for EGL_OPENGL_ES_BIT renderable type since the defaults for
      major/minor are 1.0, so we can't get an ES2 context with a null
      attributes list. If ES 1 isn't available, skip.
---
 tests/all_egl.tests                                |    1 +
 .../spec/egl_khr_create_context/CMakeLists.gl.txt  |    1 +
 .../valid-attribute-null-gles.c                    |   81 ++++++++++++++++++++
 3 files changed, 83 insertions(+), 0 deletions(-)
 create mode 100644 
tests/egl/spec/egl_khr_create_context/valid-attribute-null-gles.c

diff --git a/tests/all_egl.tests b/tests/all_egl.tests
index 8abe82b..31ca063 100644
--- a/tests/all_egl.tests
+++ b/tests/all_egl.tests
@@ -23,3 +23,4 @@ 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')
 create_context['valid attribute empty GLES'] = 
plain_test('egl-create-context-valid-attribute-empty-gles')
+create_context['NULL valid attribute GLES'] = 
plain_test('egl-create-context-valid-attribute-null-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 7b7b9f9..ffe38a5 100644
--- a/tests/egl/spec/egl_khr_create_context/CMakeLists.gl.txt
+++ b/tests/egl/spec/egl_khr_create_context/CMakeLists.gl.txt
@@ -14,5 +14,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)
 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-null-gles 
valid-attribute-null-gles.c common.c)
 
 # vim: ft=cmake:
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
new file mode 100644
index 0000000..3ab7482
--- /dev/null
+++ b/tests/egl/spec/egl_khr_create_context/valid-attribute-null-gles.c
@@ -0,0 +1,81 @@
+/* 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_ES_BIT)) {
+               fprintf(stderr, "ES 1 not available.\n");
+               piglit_report_result(PIGLIT_SKIP);
+       }
+
+       /* 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 || (minor != 0 && minor != 1)) {
+               fprintf(stderr,
+                       "Unexpected GLES version: %s\n"
+                       "Expected ES 1.0 or ES 1.1.\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

_______________________________________________
Piglit mailing list
Piglit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/piglit

Reply via email to