[Piglit] [PATCH] egl: new test egl-create-msaa-pbuffer-surface

[Tapani Pälli]

Test initializes EGLConfig with EGL_SAMPLES set to 4 and attempts
to create a pbuffer with such config. This causes a crash in Mesa
i965 driver but passes on Nvidia binary driver version 355.11.

(dEQP EGL tests are currently hitting this path)
---
 tests/all.py                                |  3 ++
 tests/egl/CMakeLists.gl.txt                 |  2 +
 tests/egl/egl-create-msaa-pbuffer-surface.c | 76 +++++++++++++++++++++++++++++
 3 files changed, 81 insertions(+)
 create mode 100644 tests/egl/egl-create-msaa-pbuffer-surface.c

diff --git a/tests/all.py b/tests/all.py
index d7524b0..b4f0e02 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -4436,6 +4436,9 @@ with profile.group_manager(
     g(['egl-create-pbuffer-surface'],
       'eglCreatePbufferSurface and then glClear',
       run_concurrent=False)
+    g(['egl-create-msaa-pbuffer-surface'],
+      'eglCreatePbufferSurface with EGL_SAMPLES set',
+      run_concurrent=False)
     g(['egl-create-largest-pbuffer-surface'],
       'largest possible eglCreatePbufferSurface and then glClear',
       run_concurrent=False)
diff --git a/tests/egl/CMakeLists.gl.txt b/tests/egl/CMakeLists.gl.txt
index 06fbecb..3660e04 100644
--- a/tests/egl/CMakeLists.gl.txt
+++ b/tests/egl/CMakeLists.gl.txt
@@ -21,6 +21,8 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 	target_link_libraries(egl-query-surface pthread ${X11_X11_LIB})
 	piglit_add_executable (egl-create-pbuffer-surface egl-util.c egl-create-pbuffer-surface.c)
 	target_link_libraries(egl-create-pbuffer-surface pthread ${X11_X11_LIB})
+	piglit_add_executable (egl-create-msaa-pbuffer-surface egl-util.c egl-create-msaa-pbuffer-surface.c)
+	target_link_libraries(egl-create-msaa-pbuffer-surface pthread ${X11_X11_LIB})
 	piglit_add_executable (egl-create-largest-pbuffer-surface egl-util.c egl-create-largest-pbuffer-surface.c)
 	target_link_libraries(egl-create-largest-pbuffer-surface pthread ${X11_X11_LIB})
 	piglit_add_executable (egl-configless-context egl-configless-context.c)
diff --git a/tests/egl/egl-create-msaa-pbuffer-surface.c b/tests/egl/egl-create-msaa-pbuffer-surface.c
new file mode 100644
index 0000000..549eaab
--- /dev/null
+++ b/tests/egl/egl-create-msaa-pbuffer-surface.c
@@ -0,0 +1,76 @@
+/*
+ * Copyright © 2016 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.
+ *
+ */
+
+/** @file egl-create-msaa-pbuffer-surface.c
+ *
+ * Test EGLCreatePBufferSurface behaviour with EGL_SAMPLES set.
+ */
+
+#include "piglit-util-gl.h"
+#include "egl-util.h"
+
+static enum piglit_result
+draw(struct egl_state *state)
+{
+	EGLSurface surf;
+	const EGLint srfPbufferAttr[] =
+	{
+		EGL_WIDTH, 256,
+		EGL_HEIGHT, 256,
+		EGL_NONE
+	};
+
+	surf = eglCreatePbufferSurface(state->egl_dpy,
+				       state->cfg, srfPbufferAttr);
+
+	if (eglGetError() != EGL_SUCCESS || surf == EGL_NO_SURFACE) {
+		fprintf(stderr, "eglCreatePbufferSurface failed\n");
+		return PIGLIT_FAIL;
+	}
+
+	eglDestroySurface(state->egl_dpy, surf);
+	return PIGLIT_PASS;
+}
+
+int
+main(int argc, char *argv[])
+{
+	struct egl_test test;
+	const EGLint test_attribs[] =
+	{
+		EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
+		EGL_SAMPLES, 4,
+		EGL_NONE
+	};
+
+	egl_init_test(&test);
+	test.draw = draw;
+	test.stop_on_failure = true;
+	test.config_attribs = test_attribs;
+
+	if (egl_util_run(&test, argc, argv) != PIGLIT_PASS)
+		return EXIT_FAILURE;
+
+	return EXIT_SUCCESS;
+}
-- 
2.5.5