KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Ilia Mirkin 2014-09-13 10:45:08 -04:00
parent 9133784a46
commit b13a4ca3f7
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/mesa/drivers/dri/nouveau/nouveau_render_t.c
View File

@ -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)