Merge remote branch 'origin/master' into nv50-compiler

[mesa.git] / src / mesa / main / shared.c

diff --git a/src/mesa/main/shared.c b/src/mesa/main/shared.c
index f9d10f3bbea001d3045613c5fd4210eabb19bc69..ea7e503cf3bad94947b07dc8386888f66de3ffc1 100644 (file)
--- a/src/mesa/main/shared.c
+++ b/src/mesa/main/shared.c
@@ -32,7 +32,6 @@
 #include "imports.h"
 #include "mtypes.h"
 #include "hash.h"
-#include "arrayobj.h"
 #if FEATURE_ATI_fragment_shader
 #include "atifragshader.h"
 #endif
@@ -289,6 +288,10 @@ free_shared_state(GLcontext *ctx, struct gl_shared_state *shared)
 {
    GLuint i;
 
+   /* Free the dummy/fallback texture object */
+   if (shared->FallbackTex)
+      ctx->Driver.DeleteTexture(ctx, shared->FallbackTex);
+
    /*
     * Free display lists
     */