Mesa (master): util: Don't destroy shaders null shaders

[Jakob Bornecrantz]

Module: Mesa
Branch: master
Commit: ca8a91ff7eb7e3fb4595763ea71f427b97e426c6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ca8a91ff7eb7e3fb4595763ea71f427b97e426c6

Author: Jakob Bornecrantz <jakob at vmware.com>
Date:   Sat Feb 26 02:32:22 2011 +0100

util: Don't destroy shaders null shaders

Fixes regression from a08e612fd8e7ca2ac2fef8961e56e5b094033717

---

 src/gallium/auxiliary/util/u_gen_mipmap.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_gen_mipmap.c b/src/gallium/auxiliary/util/u_gen_mipmap.c
index 6fba600..4f1b0e7 100644
--- a/src/gallium/auxiliary/util/u_gen_mipmap.c
+++ b/src/gallium/auxiliary/util/u_gen_mipmap.c
@@ -1451,8 +1451,10 @@ util_destroy_gen_mipmap(struct gen_mipmap_state *ctx)
 {
    struct pipe_context *pipe = ctx->pipe;
 
-   pipe->delete_fs_state(pipe, ctx->fs2da);
-   pipe->delete_fs_state(pipe, ctx->fs1da);
+   if (ctx->fs2da)
+      pipe->delete_fs_state(pipe, ctx->fs2da);
+   if (ctx->fs1da)
+      pipe->delete_fs_state(pipe, ctx->fs1da);
    pipe->delete_fs_state(pipe, ctx->fsCube);
    pipe->delete_fs_state(pipe, ctx->fs3d);
    pipe->delete_fs_state(pipe, ctx->fs2d);