diff options
| author | Ilia Mirkin <[email protected]> | 2014-09-13 10:45:08 -0400 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2014-09-16 22:16:16 +0100 |
| commit | efe8fc687db0140d5aa177fb51c093f81b78b2dc (patch) | |
| tree | 3f6cd5531585c33d19ee897bad1d5dbf534e882b | |
| parent | 051543962f95b31573ea929bc94d4527dfef8889 (diff) | |
nouveau: change internal variables to avoid conflicts with macro args
Reported by Coverity
Signed-off-by: Ilia Mirkin <[email protected]>
Cc: "10.2 10.3" <[email protected]>
(cherry picked from commit b13a4ca3f7f622cbf688eec14d3f4156533af44e)
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nouveau_render_t.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_render_t.c b/src/mesa/drivers/dri/nouveau/nouveau_render_t.c index 0063dac2d78..1625a87223f 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_render_t.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_render_t.c @@ -56,21 +56,21 @@ */ #define EMIT_VBO(out, ctx, start, delta, n) do { \ struct nouveau_render_state *render = to_render_state(ctx); \ - int npush = n; \ + int _npush = n; \ \ - while (npush) { \ - int npack = MIN2(npush, MAX_PACKET * MAX_OUT_##out); \ - npush -= npack; \ + while (_npush) { \ + int _npack = MIN2(_npush, MAX_PACKET * MAX_OUT_##out); \ + _npush -= _npack; \ \ - BATCH_PACKET_##out((npack + MAX_OUT_##out - 1) \ + BATCH_PACKET_##out((_npack + MAX_OUT_##out - 1) \ / MAX_OUT_##out); \ - while (npack) { \ - int nout = MIN2(npack, MAX_OUT_##out); \ - npack -= nout; \ + while (_npack) { \ + int _nout = MIN2(_npack, MAX_OUT_##out);\ + _npack -= _nout; \ \ OUT_INDICES_##out(render, start, delta, \ - nout); \ - start += nout; \ + _nout); \ + start += _nout; \ } \ } \ } while (0) |