Re: [Piglit] [PATCH 1/5] glx_arb_create_context_profile: Verify that invalid profiles are rejected

2012-06-13 Thread Chad Versace
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

On 06/12/2012 02:30 PM, Ian Romanick wrote:
 From: Ian Romanick ian.d.roman...@intel.com
 
 NVIDIA's closed-source driver passes this test.  AMD's closed-source
 driver has not been tested.
 
 Signed-off-by: Ian Romanick ian.d.roman...@intel.com


Reviewed-by: Chad Versace chad.vers...@linux.intel.com


-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.19 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBAgAGBQJP2QV8AAoJEAIvNt057x8i1yQP/j6cnvXXLcd/JVIu4v/k3Ii2
v7o0C3wcTHndxW7F1vC/CH6SbtqukPYMxy4JNaIy6ahjTKGC4fKiXqPFZvdkGIny
hMJRq+8XY4aN7Y5KGYj+DtdixEUHeg69mIGreZJl+KhAaJ6uJImh5KW0MTBqH98N
QYe8jddVdza8PIXVJizTW5cy++t8VobAc42pCvV0jYc2KJQqEpRQB+qiMvuTPCpk
vWZS8iA1g2/SlCrR0MfZkzy9ijmH4atozgNBgR9COXK6jPsSl+/QWLWnNsRc+CJE
blaY8bawIgTgTZxkddFigHbjIEuZvX/+SwAbJlFMUYLS9/DZoZ+lV8t7Kh3SBVJ1
/wl/sBmiLXolAuOPjYERmXQsvTF3YwEWy+ha5s2daaQsiRiQIKroOWwL6YjVt1Tf
xVlQbkzNGrzdtH0jw9+dnU8aevErqLDlt7yckn/joEkLHXK8P71NAGy06cVav8Z8
+Kuhi2pEVCzXMxVXkAC8r8GciSm1V6tQq6yXTLu4DMiofD1CH8prGPlgd9S76lun
U6iDBN45AP89fwSwzuAlN9JAYB5JzyKDOaOdibJuTuEgQEb+Y+cR8iSSV4aUez5N
90Ee5rAjPxhNJAfpGmpihZsTb2Ly95R8Vh71tY+fA7ak1pwjLp9dbSuuxCazY6Td
9KBxu8JjYg8ddVCnaR4G
=jSOi
-END PGP SIGNATURE-
___
Piglit mailing list
Piglit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/piglit


[Piglit] [PATCH 1/5] glx_arb_create_context_profile: Verify that invalid profiles are rejected

2012-06-12 Thread Ian Romanick
From: Ian Romanick ian.d.roman...@intel.com

NVIDIA's closed-source driver passes this test.  AMD's closed-source
driver has not been tested.

Signed-off-by: Ian Romanick ian.d.roman...@intel.com
---
 tests/all.tests|4 +
 .../spec/glx_arb_create_context/CMakeLists.gl.txt  |1 +
 .../spec/glx_arb_create_context/invalid-profile.c  |  105 
 3 files changed, 110 insertions(+), 0 deletions(-)
 create mode 100644 tests/spec/glx_arb_create_context/invalid-profile.c

diff --git a/tests/all.tests b/tests/all.tests
index a004323..7b1f341 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -684,6 +684,10 @@ create_context['empty attribute list'] = 
PlainExecTest(['glx-create-context-vali
 create_context['NULL attribute list'] = 
PlainExecTest(['glx-create-context-valid-attribute-null'])
 create_context['forward-compatible flag with 3.0'] = 
PlainExecTest(['glx-create-context-valid-flag-forward-compatible'])
 
+create_context_profile = Group();
+glx['GLX_ARB_create_context_profile'] = create_context_profile
+create_context_profile['invalid profile'] = 
PlainExecTest(['glx-create-context-invalid-profile'])
+
 texturing = Group()
 add_concurrent_test(texturing, '1-1-linear-texture')
 add_plain_test(texturing, 'array-texture')
diff --git a/tests/spec/glx_arb_create_context/CMakeLists.gl.txt 
b/tests/spec/glx_arb_create_context/CMakeLists.gl.txt
index aad93ae..94c6d19 100644
--- a/tests/spec/glx_arb_create_context/CMakeLists.gl.txt
+++ b/tests/spec/glx_arb_create_context/CMakeLists.gl.txt
@@ -28,6 +28,7 @@ IF(BUILD_GLX_TESTS)
piglit_add_executable (glx-create-context-invalid-flag invalid-flag.c 
common.c)
piglit_add_executable 
(glx-create-context-invalid-flag-forward-compatible 
invalid-flag-forward-compatible.c common.c)
piglit_add_executable (glx-create-context-invalid-gl-version 
invalid-gl-version.c common.c)
+   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-valid-attribute-empty 
valid-attribute-empty.c common.c)
diff --git a/tests/spec/glx_arb_create_context/invalid-profile.c 
b/tests/spec/glx_arb_create_context/invalid-profile.c
new file mode 100644
index 000..875dc49
--- /dev/null
+++ b/tests/spec/glx_arb_create_context/invalid-profile.c
@@ -0,0 +1,105 @@
+/* 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_profile(int profile)
+{
+   const int attribs[] = {
+   GLX_CONTEXT_PROFILE_MASK_ARB, profile,
+   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 profile 
+   0x%08x, but this should have failed.\n,
+   profile);
+   glXDestroyContext(dpy, ctx);
+   pass = false;
+   }
+
+   /* The GLX_ARB_create_context_profile spec says:
+*
+* * If attribute GLX_CONTEXT_PROFILE_MASK_ARB has no bits set;
+*has any bits set other than GLX_CONTEXT_CORE_PROFILE_BIT_ARB
+*and GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB; has more than
+*one of these bits set; or if the implementation does not
+*support the requested profile, then GLXBadProfileARB is
+*generated.
+*/
+   if