[Piglit] [PATCH v2 8/16] util: always set piglit_is_core_profile

[Dylan Baker]

From: Marek Olšák <marek.olsak at amd.com>

---
 tests/util/piglit-framework-gl/piglit_glut_framework.c | 7 ++++---
 tests/util/piglit-framework-gl/piglit_wfl_framework.c  | 2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tests/util/piglit-framework-gl/piglit_glut_framework.c b/tests/util/piglit-framework-gl/piglit_glut_framework.c
index 075ee0d..8ac2f65 100644
--- a/tests/util/piglit-framework-gl/piglit_glut_framework.c
+++ b/tests/util/piglit-framework-gl/piglit_glut_framework.c
@@ -391,9 +391,10 @@ piglit_glut_framework_create(const struct piglit_gl_test_config *test_config)
         /* Check if we actually have a core profile */
 	{
 		int actual_version = piglit_get_gl_version();
-		if (actual_version >= 31 &&
-		    !piglit_is_extension_supported("GL_ARB_compatibility"))
-			piglit_is_core_profile = true;
+
+		piglit_is_core_profile =
+			actual_version >= 31 &&
+			!piglit_is_extension_supported("GL_ARB_compatibility");
 	}
 
 	if (!check_gl_version(test_config))
diff --git a/tests/util/piglit-framework-gl/piglit_wfl_framework.c b/tests/util/piglit-framework-gl/piglit_wfl_framework.c
index 65174da..d312ef9 100644
--- a/tests/util/piglit-framework-gl/piglit_wfl_framework.c
+++ b/tests/util/piglit-framework-gl/piglit_wfl_framework.c
@@ -544,6 +544,8 @@ make_context_current(struct piglit_wfl_framework *wfl_fw,
 		}
 	}
 
+	piglit_is_core_profile = false;
+
 	if (test_config->supports_gl_core_version &&
 	    test_config->supports_gl_compat_version) {
 		/* The above attempt to create a core context failed. */
-- 
git-series 0.8.10