i965: Rename do_<stage>_prog to brw_compile_<stage>_prog (and export)

[mesa.git] / src / mesa / drivers / dri / nouveau / nouveau_render_t.c

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_render_t.c b/src/mesa/drivers/dri/nouveau/nouveau_render_t.c
index 2afc9fafc66f5bb381896f7b1354c5cc616a63f9..1625a87223ff2bcd60c22b8e2d6eb8bd39ab3c31 100644 (file)
--- 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)
@@ -101,7 +101,7 @@ static void
 dispatch_l(struct gl_context *ctx, unsigned int start, int delta,
           unsigned int n)
 {
-       struct nouveau_channel *chan = context_chan(ctx);
+       struct nouveau_pushbuf *push = context_push(ctx);
        RENDER_LOCALS(ctx);
 
        EMIT_VBO(L, ctx, start, delta, n);
@@ -111,7 +111,7 @@ static void
 dispatch_i32(struct gl_context *ctx, unsigned int start, int delta,
             unsigned int n)
 {
-       struct nouveau_channel *chan = context_chan(ctx);
+       struct nouveau_pushbuf *push = context_push(ctx);
        RENDER_LOCALS(ctx);
 
        EMIT_VBO(I32, ctx, start, delta, n);
@@ -121,7 +121,7 @@ static void
 dispatch_i16(struct gl_context *ctx, unsigned int start, int delta,
             unsigned int n)
 {
-       struct nouveau_channel *chan = context_chan(ctx);
+       struct nouveau_pushbuf *push = context_push(ctx);
        RENDER_LOCALS(ctx);
 
        EMIT_VBO(I32, ctx, start, delta, n & 1);