glx_arb_create_context_robustness: Verify that invalid reset strategies are rejected

NVIDIA's closed-source driver passes this test.  AMD's closed-source
driver has not been tested.  The spec doesn't explicitly say what
error should be generated, but similar cases generate BadMatch.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Cc: James Jones <jajones@nvidia.com>

3 files changed, 80 insertions, 0 deletions

diff --git a/tests/all.tests b/tests/all.tests
index ff8f595d1..0b16963d4 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -710,6 +710,10 @@ create_context_profile['3.2 core profile required'] = PlainExecTest(['glx-create
 create_context_profile['invalid profile'] = PlainExecTest(['glx-create-context-invalid-profile'])
 create_context_profile['pre-GL3 profile'] = PlainExecTest(['glx-create-context-pre-GL3-profile'])
 
+create_context_robustness = Group();
+glx['GLX_ARB_create_context_robustness'] = create_context_robustness
+create_context_robustness['invalid reset notification strategy'] = PlainExecTest(['glx-create-context-invalid-reset-strategy'])
+
 create_context_es2_profile = Group();
 glx['GLX_EXT_create_context_es2_profile'] = create_context_es2_profile
 create_context_es2_profile['indirect rendering ES2 profile'] = PlainExecTest(['glx-create-context-indirect-es2-profile'])
diff --git a/tests/spec/glx_arb_create_context/CMakeLists.gl.txt b/tests/spec/glx_arb_create_context/CMakeLists.gl.txt
index 51933d5e0..8c1396ea2 100644
--- a/tests/spec/glx_arb_create_context/CMakeLists.gl.txt
+++ b/tests/spec/glx_arb_create_context/CMakeLists.gl.txt
@@ -34,6 +34,7 @@ IF(BUILD_GLX_TESTS)
 	piglit_add_executable (glx-create-context-invalid-profile invalid-profile.c common.c)
 	piglit_add_executable (glx-create-context-invalid-render-type invalid-render-type.c common.c)
 	piglit_add_executable (glx-create-context-invalid-render-type-color-index invalid-render-type-color-index.c common.c)
+	piglit_add_executable (glx-create-context-invalid-reset-strategy invalid-reset-strategy.c common.c)
 	piglit_add_executable (glx-create-context-pre-GL3-profile pre-GL3-profile.c common.c)
 	piglit_add_executable (glx-create-context-valid-attribute-empty valid-attribute-empty.c common.c)
 	piglit_add_executable (glx-create-context-valid-attribute-null valid-attribute-null.c common.c)
diff --git a/tests/spec/glx_arb_create_context/invalid-reset-strategy.c b/tests/spec/glx_arb_create_context/invalid-reset-strategy.c
new file mode 100644
index 000000000..89fa029db
--- /dev/null
+++ b/tests/spec/glx_arb_create_context/invalid-reset-strategy.c
@@ -0,0 +1,75 @@
+/* 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.h"
+#include "piglit-glx-util.h"
+#include "common.h"
+
+static bool try_reset_strategy(int reset_strategy)
+{
+	const int attribs[] = {
+		GLX_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB, reset_strategy,
+		None
+	};
+	GLXContext ctx;
+	bool pass = true;
+
+	ctx = glXCreateContextAttribsARB(dpy, fbconfig, NULL, True, attribs);
+	XSync(dpy, 0);
+
+	if (ctx != NULL) {
+		fprintf(stderr,
+			"Created OpenGL context with invalid reset "
+			"notifiction strategy\n"
+			"0x%08x, but this should have failed.\n",
+			reset_strategy);
+		glXDestroyContext(dpy, ctx);
+		pass = false;
+	}
+
+	/* The GLX_ARB_create_context_robustness spec does not say what error
+	 * code should be generated.  However, similar cases (e.g., valid GL
+	 * versions) specify BadMatch.  This is also the behavior of NVIDIA's
+	 * closed-source driver.
+	 */
+	if (!validate_glx_error_code(BadMatch, -1)) {
+		fprintf(stderr, "reset notification strategy = 0x%08x\n", reset_strategy);
+		pass = false;
+	}
+
+	return pass;
+}
+
+int main(int argc, char **argv)
+{
+	bool pass = true;
+
+	GLX_ARB_create_context_setup();
+	piglit_require_glx_extension(dpy, "GLX_ARB_create_context_robustness");
+
+	pass = try_reset_strategy(0)
+		&& pass;
+
+	GLX_ARB_create_context_teardown();
+
+	piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
+	return 0;
+}