summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Mirkin <imirkin@alum.mit.edu>2014-09-13 10:45:08 -0400
committerEmil Velikov <emil.l.velikov@gmail.com>2014-09-17 01:15:34 +0100
commit804e3fc92cb9d6d086253ec8d41ce182f999c0ff (patch)
tree68f22e2eca960e15cf485747df909ffdbf0db66a
parent6eaa23d1ff693aaed127c5dc4c1ec503fc09afd8 (diff)
nouveau: change internal variables to avoid conflicts with macro args
Reported by Coverity Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Cc: "10.2 10.3" <mesa-stable@lists.freedesktop.org> (cherry picked from commit b13a4ca3f7f622cbf688eec14d3f4156533af44e)
-rw-r--r--src/mesa/drivers/dri/nouveau/nouveau_render_t.c20
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)