From: Vinson Lee <vlee@vmware.com>
Date: Wed, 25 Aug 2010 00:40:50 +0000 (-0700)
Subject: nvfx: Initialize variables on error path.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=57e66ed9b1f6128dc8225477dcb2faa54a4960ac;p=mesa.git

nvfx: Initialize variables on error path.
---

diff --git a/src/gallium/drivers/nvfx/nv04_2d.c b/src/gallium/drivers/nvfx/nv04_2d.c
index 3761002bcb9..c05312219b6 100644
--- a/src/gallium/drivers/nvfx/nv04_2d.c
+++ b/src/gallium/drivers/nvfx/nv04_2d.c
@@ -1126,7 +1126,11 @@ nv04_region_fill_gdirect(struct nv04_2d_context *ctx, struct nv04_region* dst, i
 		cs2d_format = NV04_CONTEXT_SURFACES_2D_FORMAT_Y32;
 	}
 	else
+	{
 		assert(0);
+		gdirect_format = 0;
+		cs2d_format = 0;
+	}
 
 	MARK_RING (chan, 15, 4);
 	BEGIN_RING(chan, surf2d, NV04_CONTEXT_SURFACES_2D_DMA_IMAGE_SOURCE, 2);