From: Jakob Bornecrantz <jakob@vmware.com>
Date: Sat, 26 Feb 2011 01:32:22 +0000 (+0100)
Subject: util: Don't destroy shaders null shaders
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ca8a91ff7eb7e3fb4595763ea71f427b97e426c6;p=mesa.git

util: Don't destroy shaders null shaders

Fixes regression from a08e612fd8e7ca2ac2fef8961e56e5b094033717
---

diff --git a/src/gallium/auxiliary/util/u_gen_mipmap.c b/src/gallium/auxiliary/util/u_gen_mipmap.c
index 6fba6000ba8..4f1b0e71934 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);