Context flags are ignored by GL versions pre-3.2, not pre-3.0.
---
tests/all.tests | 2 +-
.../spec/glx_arb_create_context/CMakeLists.gl.txt | 2 +-
.../spec/glx_arb_create_context/pre-GL3-profile.c | 115 --------------------
.../spec/glx_arb_create_context/pre-GL32-profile.c | 115 ++++++++++++++++++++
4 files changed, 117 insertions(+), 117 deletions(-)
delete mode 100644 tests/spec/glx_arb_create_context/pre-GL3-profile.c
create mode 100644 tests/spec/glx_arb_create_context/pre-GL32-profile.c
diff --git a/tests/all.tests b/tests/all.tests
index fbc4d22..a8bd4f4 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -684,7 +684,7 @@ create_context_profile = Group();
glx['GLX_ARB_create_context_profile'] = create_context_profile
create_context_profile['3.2 core profile required'] =
PlainExecTest(['glx-create-context-core-profile'])
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_profile['pre-GL3.2 profile'] =
PlainExecTest(['glx-create-context-pre-GL32-profile'])
create_context_robustness = Group();
glx['GLX_ARB_create_context_robustness'] = create_context_robustness
diff --git a/tests/spec/glx_arb_create_context/CMakeLists.gl.txt
b/tests/spec/glx_arb_create_context/CMakeLists.gl.txt
index b57e948..76c403a 100644
--- a/tests/spec/glx_arb_create_context/CMakeLists.gl.txt
+++ b/tests/spec/glx_arb_create_context/CMakeLists.gl.txt
@@ -35,7 +35,7 @@ IF(PIGLIT_BUILD_GLX_TESTS)
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-pre-GL32-profile
pre-GL32-profile.c common.c)
piglit_add_executable (glx-create-context-require-robustness
require-robustness.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/pre-GL3-profile.c
b/tests/spec/glx_arb_create_context/pre-GL3-profile.c
deleted file mode 100644
index f479dee..0000000
--- a/tests/spec/glx_arb_create_context/pre-GL3-profile.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/* 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_version(int major, int minor)
-{
- GLXContext ctx;
-
- const int attribs_with_profile[] = {
- GLX_CONTEXT_MAJOR_VERSION_ARB,
- major,
-
- GLX_CONTEXT_MINOR_VERSION_ARB,
- minor,
-
- GLX_CONTEXT_PROFILE_MASK_ARB,
- GLX_CONTEXT_CORE_PROFILE_BIT_ARB,
-
- None
- };
-
- const int attribs_without_profile[] = {
- GLX_CONTEXT_MAJOR_VERSION_ARB,
- major,
-
- GLX_CONTEXT_MINOR_VERSION_ARB,
- minor,
-
- GLX_CONTEXT_PROFILE_MASK_ARB,
- GLX_CONTEXT_CORE_PROFILE_BIT_ARB,
-
- None
- };
-
- /* The GLX_ARB_create_context_profile spec says:
- *
- * "The attribute name GLX_CONTEXT_PROFILE_MASK_ARB requests an
- * OpenGL context supporting a specific <profile> of the API....If
- * the requested OpenGL version is less than 3.2,
- * GLX_CONTEXT_PROFILE_MASK_ARB is ignored and the functionality
- * of the context is determined solely by the requested version."
- *
- * Try to create a context without any profile specified. If that
- * works, try to create a context with the core profile specified.
- * That should also work.
- */
- ctx = glXCreateContextAttribsARB(dpy, fbconfig, NULL, True,
- attribs_without_profile);
- XSync(dpy, 0);
-
- if (ctx == NULL)
- return true;
-
- glXDestroyContext(dpy, ctx);
-
- ctx = glXCreateContextAttribsARB(dpy, fbconfig, NULL, True,
- attribs_with_profile);
- XSync(dpy, 0);
- if (ctx != NULL) {
- glXDestroyContext(dpy, ctx);
- return true;
- } else {
- fprintf(stderr,
- "Failed to create %d.%d context with core profile "
- "(profile value should be\nignored)\n",
- major, minor);
- return false;
- }
-}
-
-
-int main(int argc, char **argv)
-{
- bool pass = true;
-
- GLX_ARB_create_context_setup();
- piglit_require_glx_extension(dpy, "GLX_ARB_create_context_profile");
-
- pass = try_version(1, 0) && pass;
- pass = try_version(1, 1) && pass;
- pass = try_version(1, 2) && pass;
- pass = try_version(1, 3) && pass;
- pass = try_version(1, 4) && pass;
- pass = try_version(1, 5) && pass;
- pass = try_version(2, 0) && pass;
- pass = try_version(2, 1) && pass;
- pass = try_version(3, 0) && pass;
- pass = try_version(3, 1) && pass;
-
- GLX_ARB_create_context_teardown();
-
- piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
- return 0;
-}
diff --git a/tests/spec/glx_arb_create_context/pre-GL32-profile.c
b/tests/spec/glx_arb_create_context/pre-GL32-profile.c
new file mode 100644
index 0000000..f479dee
--- /dev/null
+++ b/tests/spec/glx_arb_create_context/pre-GL32-profile.c
@@ -0,0 +1,115 @@
+/* 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_version(int major, int minor)
+{
+ GLXContext ctx;
+
+ const int attribs_with_profile[] = {
+ GLX_CONTEXT_MAJOR_VERSION_ARB,
+ major,
+
+ GLX_CONTEXT_MINOR_VERSION_ARB,
+ minor,
+
+ GLX_CONTEXT_PROFILE_MASK_ARB,
+ GLX_CONTEXT_CORE_PROFILE_BIT_ARB,
+
+ None
+ };
+
+ const int attribs_without_profile[] = {
+ GLX_CONTEXT_MAJOR_VERSION_ARB,
+ major,
+
+ GLX_CONTEXT_MINOR_VERSION_ARB,
+ minor,
+
+ GLX_CONTEXT_PROFILE_MASK_ARB,
+ GLX_CONTEXT_CORE_PROFILE_BIT_ARB,
+
+ None
+ };
+
+ /* The GLX_ARB_create_context_profile spec says:
+ *
+ * "The attribute name GLX_CONTEXT_PROFILE_MASK_ARB requests an
+ * OpenGL context supporting a specific <profile> of the API....If
+ * the requested OpenGL version is less than 3.2,
+ * GLX_CONTEXT_PROFILE_MASK_ARB is ignored and the functionality
+ * of the context is determined solely by the requested version."
+ *
+ * Try to create a context without any profile specified. If that
+ * works, try to create a context with the core profile specified.
+ * That should also work.
+ */
+ ctx = glXCreateContextAttribsARB(dpy, fbconfig, NULL, True,
+ attribs_without_profile);
+ XSync(dpy, 0);
+
+ if (ctx == NULL)
+ return true;
+
+ glXDestroyContext(dpy, ctx);
+
+ ctx = glXCreateContextAttribsARB(dpy, fbconfig, NULL, True,
+ attribs_with_profile);
+ XSync(dpy, 0);
+ if (ctx != NULL) {
+ glXDestroyContext(dpy, ctx);
+ return true;
+ } else {
+ fprintf(stderr,
+ "Failed to create %d.%d context with core profile "
+ "(profile value should be\nignored)\n",
+ major, minor);
+ return false;
+ }
+}
+
+
+int main(int argc, char **argv)
+{
+ bool pass = true;
+
+ GLX_ARB_create_context_setup();
+ piglit_require_glx_extension(dpy, "GLX_ARB_create_context_profile");
+
+ pass = try_version(1, 0) && pass;
+ pass = try_version(1, 1) && pass;
+ pass = try_version(1, 2) && pass;
+ pass = try_version(1, 3) && pass;
+ pass = try_version(1, 4) && pass;
+ pass = try_version(1, 5) && pass;
+ pass = try_version(2, 0) && pass;
+ pass = try_version(2, 1) && pass;
+ pass = try_version(3, 0) && pass;
+ pass = try_version(3, 1) && pass;
+
+ GLX_ARB_create_context_teardown();
+
+ piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
+ return 0;
+}
--
1.7.8.6
_______________________________________________
Piglit mailing list
Piglit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/piglit
