diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2014-08-12 17:43:07 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2014-08-18 13:50:14 +0100 |
| commit | 998d8c2b2ade49917f490f430424c3fd890685a8 (patch) | |
| tree | 7ba400361262d49f9a74e887a0a1850807244856 | |
| parent | edc922d57a098edb55319395e6ae3bcff9412cf8 (diff) | |
utils/wfl: use correct destroy order in special_case_gl31()
Destroy the components in the inverse order of the way we've created
them. Waffle's WGL backend actually creates the window at
config_choose() time, and displays/hides it at create/destroy time.
If we don't follow the correct order the window is destroyed at
config_destroy() and hiding it at window_destroy will trigger an
assert.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
| -rw-r--r-- | tests/util/piglit-framework-gl/piglit_wfl_framework.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/util/piglit-framework-gl/piglit_wfl_framework.c b/tests/util/piglit-framework-gl/piglit_wfl_framework.c index 73665f554..ac99e0013 100644 --- a/tests/util/piglit-framework-gl/piglit_wfl_framework.c +++ b/tests/util/piglit-framework-gl/piglit_wfl_framework.c @@ -458,12 +458,12 @@ special_case_gl31(struct piglit_wfl_framework *wfl_fw, "profile if context creation succeeds.", context_description, error_verb); - waffle_config_destroy(wfl_fw->config); - waffle_context_destroy(wfl_fw->context); waffle_window_destroy(wfl_fw->window); - wfl_fw->config = NULL; - wfl_fw->context = NULL; + waffle_context_destroy(wfl_fw->context); + waffle_config_destroy(wfl_fw->config); wfl_fw->window = NULL; + wfl_fw->context = NULL; + wfl_fw->config = NULL; return make_context_current_singlepass( wfl_fw, &fallback_config, flavor, |