Module: Mesa Branch: master Commit: 57e66ed9b1f6128dc8225477dcb2faa54a4960ac URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=57e66ed9b1f6128dc8225477dcb2faa54a4960ac
Author: Vinson Lee <[email protected]> Date: Tue Aug 24 17:40:50 2010 -0700 nvfx: Initialize variables on error path. --- src/gallium/drivers/nvfx/nv04_2d.c | 4 ++++ 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 3761002..c053122 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); _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
