summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinson Lee <[email protected]>2010-08-24 17:40:50 -0700
committerVinson Lee <[email protected]>2010-08-24 17:40:50 -0700
commit57e66ed9b1f6128dc8225477dcb2faa54a4960ac (patch)
tree151cf447b956b953b0792eb01140eb04be05c638
parent2f5bf20e44d509fa3afbe2cfbb9bb65347daea6a (diff)
nvfx: Initialize variables on error path.
-rw-r--r--src/gallium/drivers/nvfx/nv04_2d.c4
1 files changed, 4 insertions, 0 deletions
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);