[cogl/cogl-1.8] cogl-context: Destroy texture units later on

[Neil Roberts <nroberts src gnome org>]

commit 4e59e567d431ba9599f1d6e9814e94a5b49e6265
Author: Neil Roberts <neil linux intel com>
Date:   Fri Nov 4 12:53:25 2011 +0000

    cogl-context: Destroy texture units later on
    
    This patch moves the call to _cogl_destroy_texture_units() from
    _cogl_context_free() to later on. When destroying a GL texture the
    texture units are checked. This would end up accessing invalid memory
    so we need to try to destroy the texture units only after everything
    that might be referencing a texture has been destroyed.
    
    Reviewed-by: Robert Bragg <robert linux intel com>
    
    (cherry picked from commit 1566941c2fe67fa7d95f489aeede1d0801427614)

 cogl/cogl-context.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/cogl/cogl-context.c b/cogl/cogl-context.c
index d4bbc20..b44a748 100644
--- a/cogl/cogl-context.c
+++ b/cogl/cogl-context.c
@@ -396,8 +396,6 @@ _cogl_context_free (CoglContext *context)
 
   winsys->context_deinit (context);
 
-  _cogl_destroy_texture_units ();
-
   if (context->window_buffer)
     {
       cogl_object_unref (context->window_buffer);
@@ -474,6 +472,8 @@ _cogl_context_free (CoglContext *context)
 
   cogl_pipeline_cache_free (context->pipeline_cache);
 
+  _cogl_destroy_texture_units ();
+
   g_byte_array_free (context->buffer_map_fallback_array, TRUE);
 
   cogl_object_unref (context->display);