projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2f5bf20
)
nvfx: Initialize variables on error path.
author
Vinson Lee
<vlee@vmware.com>
Wed, 25 Aug 2010 00:40:50 +0000
(17:40 -0700)
committer
Vinson Lee
<vlee@vmware.com>
Wed, 25 Aug 2010 00:40:50 +0000
(17:40 -0700)
src/gallium/drivers/nvfx/nv04_2d.c
patch
|
blob
|
history
diff --git
a/src/gallium/drivers/nvfx/nv04_2d.c
b/src/gallium/drivers/nvfx/nv04_2d.c
index 3761002bcb990c3040fd25c24bad4325dec45228..c05312219b6423d01d223ddd684b94dd1ad98af2 100644
(file)
--- 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);