summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChad Versace <chad.versace@linux.intel.com>2012-11-14 14:14:48 -0800
committerChad Versace <chad.versace@linux.intel.com>2012-11-14 14:19:45 -0800
commit4b057bb44bb0528435ff7bebd36c4c74f8db3bae (patch)
tree462dfe159557ecaf48aad5b0dc90a4eee836311d
parent634e486ab2846c8f4d79126d4fea29240212a4db (diff)
util/gl: Set WAFFLE_CONTEXT_PROFILE for compatibility profiles
If piglit_gl_test_config::supports_gl_compat_version was >= 32, then Piglit neglected to set the WAFFLE_CONTEXT_PROFILE attribute. Luckily this introduced no errors, because Piglit does not yet contain any 3.2 tests. Piglit also neglected to set the profile attribute when piglit_gl_test_config::supports_gl_core_version was >= 32, but this was safe because the default value of WAFFLE_CONTEXT_PROFILE is WAFFLE_CONTEXT_CORE_PROFILE for GL versions >= 3.2. However, explicitly set it anyway for self-documentation. Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
-rw-r--r--tests/util/piglit-framework-gl/piglit_wfl_framework.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/tests/util/piglit-framework-gl/piglit_wfl_framework.c b/tests/util/piglit-framework-gl/piglit_wfl_framework.c
index 4b300b16..eb117b5b 100644
--- a/tests/util/piglit-framework-gl/piglit_wfl_framework.c
+++ b/tests/util/piglit-framework-gl/piglit_wfl_framework.c
@@ -162,6 +162,11 @@ choose_config(struct piglit_wfl_framework *wfl_fw,
head_attrib_list[i++] = WAFFLE_CONTEXT_API;
head_attrib_list[i++] = WAFFLE_CONTEXT_OPENGL;
+ if (test_config->supports_gl_core_version >= 32) {
+ head_attrib_list[i++] = WAFFLE_CONTEXT_PROFILE;
+ head_attrib_list[i++] = WAFFLE_CONTEXT_CORE_PROFILE;
+ }
+
head_attrib_list[i++] = WAFFLE_CONTEXT_MAJOR_VERSION;
head_attrib_list[i++] = test_config->supports_gl_core_version / 10;
@@ -178,6 +183,11 @@ choose_config(struct piglit_wfl_framework *wfl_fw,
head_attrib_list[i++] = WAFFLE_CONTEXT_API;
head_attrib_list[i++] = WAFFLE_CONTEXT_OPENGL;
+ if (test_config->supports_gl_compat_version >= 32) {
+ head_attrib_list[i++] = WAFFLE_CONTEXT_PROFILE;
+ head_attrib_list[i++] = WAFFLE_CONTEXT_COMPATIBILITY_PROFILE;
+ }
+
head_attrib_list[i++] = WAFFLE_CONTEXT_MAJOR_VERSION;
head_attrib_list[i++] = test_config->supports_gl_compat_version / 10;