diff options
| author | Maciej Cencora <[email protected]> | 2009-11-23 22:14:48 +0100 |
|---|---|---|
| committer | Maciej Cencora <[email protected]> | 2009-11-23 22:14:48 +0100 |
| commit | 5173d14cb5821637f22247d16be1b970f3762d6a (patch) | |
| tree | e93826ec799fdbe513592e253278545e2584a7bf /src/gallium/auxiliary | |
| parent | 18384af7491c408c4182b72807b02c11b55509f8 (diff) | |
| parent | 960464e42dce138fde11c379ce7744bc4be14aa2 (diff) | |
Merge commit 'origin/mesa_7_7_branch'
Diffstat (limited to 'src/gallium/auxiliary')
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_pt.c | 3 | ||||
| -rw-r--r-- | src/gallium/auxiliary/util/u_pack_color.h | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/draw/draw_pt.c b/src/gallium/auxiliary/draw/draw_pt.c index dbb5ac71821..4865a2d8542 100644 --- a/src/gallium/auxiliary/draw/draw_pt.c +++ b/src/gallium/auxiliary/draw/draw_pt.c @@ -192,7 +192,8 @@ draw_print_arrays(struct draw_context *draw, uint prim, int start, uint count) prim, start, count); for (i = 0; i < count; i++) { - uint ii, j; + uint ii = 0; + uint j; if (draw->pt.user.elts) { /* indexed arrays */ diff --git a/src/gallium/auxiliary/util/u_pack_color.h b/src/gallium/auxiliary/util/u_pack_color.h index eda883b3b92..9dacc6d83db 100644 --- a/src/gallium/auxiliary/util/u_pack_color.h +++ b/src/gallium/auxiliary/util/u_pack_color.h @@ -302,7 +302,10 @@ util_unpack_color_ub(enum pipe_format format, const void *src, static INLINE void util_pack_color(const float rgba[4], enum pipe_format format, void *dest) { - ubyte r, g, b, a; + ubyte r = 0; + ubyte g = 0; + ubyte b = 0; + ubyte a = 0; if (pf_size_x(format) <= 8) { /* format uses 8-bit components or less */ |