From: Christoph Bumiller <e0425955@student.tuwien.ac.at>
Date: Sun, 19 Dec 2010 21:49:50 +0000 (+0100)
Subject: nvc0: s/INLIN_RING/IMMED_RING
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9f2cf899578464a7448d7abec681bde42eb3d2f2;p=mesa.git

nvc0: s/INLIN_RING/IMMED_RING
---

diff --git a/src/gallium/drivers/nvc0/nvc0_push.c b/src/gallium/drivers/nvc0/nvc0_push.c
index 8cb05cdd09e..5116929b50d 100644
--- a/src/gallium/drivers/nvc0/nvc0_push.c
+++ b/src/gallium/drivers/nvc0/nvc0_push.c
@@ -261,7 +261,7 @@ nvc0_push_vbo(struct nvc0_context *nvc0, const struct pipe_draw_info *info)
          assert(0);
          break;
       }
-      INLIN_RING(ctx.chan, RING_3D(VERTEX_END_GL), 0);
+      IMMED_RING(ctx.chan, RING_3D(VERTEX_END_GL), 0);
 
       ctx.prim |= NVC0_3D_VERTEX_BEGIN_GL_INSTANCE_NEXT;
    }
diff --git a/src/gallium/drivers/nvc0/nvc0_push2.c b/src/gallium/drivers/nvc0/nvc0_push2.c
index 07dd7b56b90..1f4ba256c17 100644
--- a/src/gallium/drivers/nvc0/nvc0_push2.c
+++ b/src/gallium/drivers/nvc0/nvc0_push2.c
@@ -161,7 +161,7 @@ emit_edgeflag(struct push_context *ctx, boolean enabled)
 {
    struct nouveau_channel *chan = ctx->nvc0->screen->base.channel;
    
-   INLIN_RING(chan, RING_3D(EDGEFLAG_ENABLE), enabled);
+   IMMED_RING(chan, RING_3D(EDGEFLAG_ENABLE), enabled);
 }
 
 static void
@@ -322,7 +322,7 @@ nvc0_push_vbo2(struct nvc0_context *nvc0, const struct pipe_draw_info *info)
          emit_elt32(&ctx, info->start, info->count);
          break;
       }
-      INLIN_RING(nvc0->screen->base.channel, RING_3D(VERTEX_END_GL), 0);
+      IMMED_RING(nvc0->screen->base.channel, RING_3D(VERTEX_END_GL), 0);
 
       prim |= NVC0_3D_VERTEX_BEGIN_GL_INSTANCE_NEXT;
    }
diff --git a/src/gallium/drivers/nvc0/nvc0_state_validate.c b/src/gallium/drivers/nvc0/nvc0_state_validate.c
index a395b18a99f..f20e7e962ca 100644
--- a/src/gallium/drivers/nvc0/nvc0_state_validate.c
+++ b/src/gallium/drivers/nvc0/nvc0_state_validate.c
@@ -249,7 +249,7 @@ nvc0_validate_clip(struct nvc0_context *nvc0)
       BEGIN_RING(chan, RING_3D(VP_CLIP_DISTANCE_ENABLE), 1);
       OUT_RING  (chan, (1 << nvc0->clip.nr) - 1);
    } else {
-      INLIN_RING(chan, RING_3D(VP_CLIP_DISTANCE_ENABLE), 0);
+      IMMED_RING(chan, RING_3D(VP_CLIP_DISTANCE_ENABLE), 0);
    }
 }
 
diff --git a/src/gallium/drivers/nvc0/nvc0_vbo.c b/src/gallium/drivers/nvc0/nvc0_vbo.c
index f1d5910e3da..93b9a561785 100644
--- a/src/gallium/drivers/nvc0/nvc0_vbo.c
+++ b/src/gallium/drivers/nvc0/nvc0_vbo.c
@@ -172,13 +172,13 @@ nvc0_vertex_arrays_validate(struct nvc0_context *nvc0)
 
       if (unlikely(ve->pipe.instance_divisor)) {
          if (!(nvc0->state.instance_bits & (1 << i))) {
-            INLIN_RING(chan, RING_3D(VERTEX_ARRAY_PER_INSTANCE(i)), 1);
+            IMMED_RING(chan, RING_3D(VERTEX_ARRAY_PER_INSTANCE(i)), 1);
          }
          BEGIN_RING(chan, RING_3D(VERTEX_ARRAY_DIVISOR(i)), 1);
          OUT_RING  (chan, ve->pipe.instance_divisor);
       } else
       if (unlikely(nvc0->state.instance_bits & (1 << i))) {
-         INLIN_RING(chan, RING_3D(VERTEX_ARRAY_PER_INSTANCE(i)), 0);
+         IMMED_RING(chan, RING_3D(VERTEX_ARRAY_PER_INSTANCE(i)), 0);
       }
 
       nvc0_bufctx_add_resident(nvc0, NVC0_BUFCTX_VERTEX, res, NOUVEAU_BO_RD);
@@ -308,7 +308,7 @@ nvc0_draw_arrays(struct nvc0_context *nvc0,
       BEGIN_RING(chan, RING_3D(VERTEX_BUFFER_FIRST), 2);
       OUT_RING  (chan, start);
       OUT_RING  (chan, count);
-      INLIN_RING(chan, RING_3D(VERTEX_END_GL), 0);
+      IMMED_RING(chan, RING_3D(VERTEX_END_GL), 0);
 
       prim |= NVC0_3D_VERTEX_BEGIN_GL_INSTANCE_NEXT;
    }
@@ -450,7 +450,7 @@ nvc0_draw_elements(struct nvc0_context *nvc0, boolean shorten,
          OUT_RING  (chan, index_size);
          OUT_RING  (chan, start);
          OUT_RING  (chan, count);
-         INLIN_RING(chan, RING_3D(VERTEX_END_GL), 0);
+         IMMED_RING(chan, RING_3D(VERTEX_END_GL), 0);
 
          mode |= NVC0_3D_VERTEX_BEGIN_GL_INSTANCE_NEXT;
       }
@@ -481,7 +481,7 @@ nvc0_draw_elements(struct nvc0_context *nvc0, boolean shorten,
             assert(0);
             return;
          }
-         INLIN_RING(chan, RING_3D(VERTEX_END_GL), 0);
+         IMMED_RING(chan, RING_3D(VERTEX_END_GL), 0);
 
          prim |= NVC0_3D_VERTEX_BEGIN_GL_INSTANCE_NEXT;
       }
@@ -540,7 +540,7 @@ nvc0_draw_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info)
             if (info->restart_index > 65535)
                shorten = FALSE;
          } else {
-            INLIN_RING(chan, RING_3D(PRIM_RESTART_ENABLE), 0);
+            IMMED_RING(chan, RING_3D(PRIM_RESTART_ENABLE), 0);
          }
          nvc0->state.prim_restart = info->primitive_restart;
       } else
diff --git a/src/gallium/drivers/nvc0/nvc0_winsys.h b/src/gallium/drivers/nvc0/nvc0_winsys.h
index 34bc5367657..85f8ed4da49 100644
--- a/src/gallium/drivers/nvc0/nvc0_winsys.h
+++ b/src/gallium/drivers/nvc0/nvc0_winsys.h
@@ -82,7 +82,7 @@ BEGIN_RING_1I(struct nouveau_channel *chan, uint32_t mthd, unsigned size)
 
 /* inline-data */
 static INLINE void
-INLIN_RING(struct nouveau_channel *chan, uint32_t mthd, unsigned data)
+IMMED_RING(struct nouveau_channel *chan, uint32_t mthd, unsigned data)
 {
    WAIT_RING(chan, 1);
    OUT_RING (chan, (0x8 << 28) | (data << 16) | mthd);