auxiliary: fix u_split_prim naming convention

Current practice is to start identifiers with "util_" instead of "u_".

diff --git a/src/gallium/auxiliary/util/u_split_prim.h b/src/gallium/auxiliary/util/u_split_prim.h
index 3c438da0bafa9a16617dce573a883cfeb4d08f36..e526a73fc3b4c3702e3949b22c207de8a5e86599 100644 (file)
--- a/src/gallium/auxiliary/util/u_split_prim.h
+++ b/src/gallium/auxiliary/util/u_split_prim.h
@@ -1,7 +1,7 @@
 /* Originally written by Ben Skeggs for the nv50 driver*/
 #include <pipe/p_defines.h>
 
-struct u_split_prim {
+struct util_split_prim {
    void *priv;
    void (*emit)(void *priv, unsigned start, unsigned count);
    void (*edge)(void *priv, boolean enabled);
@@ -17,7 +17,7 @@ struct u_split_prim {
 };
 
 static INLINE void
-u_split_prim_init(struct u_split_prim *s,
+util_split_prim_init(struct util_split_prim *s,
                   unsigned mode, unsigned start, unsigned count)
 {
    if (mode == PIPE_PRIM_LINE_LOOP) {
@@ -35,7 +35,7 @@ u_split_prim_init(struct u_split_prim *s,
 }
 
 static INLINE boolean
-u_split_prim_next(struct u_split_prim *s, unsigned max_verts)
+util_split_prim_next(struct util_split_prim *s, unsigned max_verts)
 {
    int repeat = 0;
 

diff --git a/src/gallium/drivers/nv50/nv50_push.c b/src/gallium/drivers/nv50/nv50_push.c
index ee87144dcf10a8d11e0a0843d38a6f2e54dab559..6a2ffd5a3c8e90d548c94bc3ac5d400bda6063fe 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_push.c
+++ b/src/gallium/drivers/nv50/nv50_push.c
@@ -217,7 +217,7 @@ nv50_push_elements_instanced(struct pipe_context *pipe,
                                4; /* potential edgeflag enable/disable */
    const unsigned v_overhead = 1 + /* VERTEX_DATA packet header */
                                2; /* potential edgeflag modification */
-   struct u_split_prim s;
+   struct util_split_prim s;
    unsigned vtx_size;
    boolean nzi = FALSE;
    int i;
@@ -335,7 +335,7 @@ nv50_push_elements_instanced(struct pipe_context *pipe,
          ctx.attr[i].map = (uint8_t *)ctx.attr[i].map + ctx.attr[i].stride;
       }
 
-      u_split_prim_init(&s, mode, start, count);
+      util_split_prim_init(&s, mode, start, count);
       do {
          if (AVAIL_RING(chan) < p_overhead + (6 * vtx_size)) {
             FIRE_RING(chan);
@@ -351,7 +351,7 @@ nv50_push_elements_instanced(struct pipe_context *pipe,
 
          BEGIN_RING(chan, tesla, NV50TCL_VERTEX_BEGIN, 1);
          OUT_RING  (chan, nv50_prim(s.mode) | (nzi ? (1 << 28) : 0));
-         done = u_split_prim_next(&s, max_verts);
+         done = util_split_prim_next(&s, max_verts);
          BEGIN_RING(chan, tesla, NV50TCL_VERTEX_END, 1);
          OUT_RING  (chan, 0);
       } while (!done);

diff --git a/src/gallium/drivers/nv50/nv50_vbo.c b/src/gallium/drivers/nv50/nv50_vbo.c
index 0937668b84576339b05aa4f90d17aeb13690b54a..1f119501999db20bbae9b8490c365afc6d856101 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_vbo.c
+++ b/src/gallium/drivers/nv50/nv50_vbo.c
@@ -311,7 +311,7 @@ nv50_draw_elements_inline(struct pipe_context *pipe,
        struct pipe_transfer *transfer;
        struct instance a[16];
        struct inline_ctx ctx;
-       struct u_split_prim s;
+       struct util_split_prim s;
        boolean nzi = FALSE;
        unsigned overhead;
 
@@ -347,7 +347,7 @@ nv50_draw_elements_inline(struct pipe_context *pipe,
                unsigned max_verts;
                boolean done;
 
-               u_split_prim_init(&s, mode, start, count);
+               util_split_prim_init(&s, mode, start, count);
                do {
                        if (AVAIL_RING(chan) < (overhead + 6)) {
                                FIRE_RING(chan);
@@ -366,7 +366,7 @@ nv50_draw_elements_inline(struct pipe_context *pipe,
 
                        BEGIN_RING(chan, tesla, NV50TCL_VERTEX_BEGIN, 1);
                        OUT_RING  (chan, nv50_prim(s.mode) | (nzi ? (1<<28) : 0));
-                       done = u_split_prim_next(&s, max_verts);
+                       done = util_split_prim_next(&s, max_verts);
                        BEGIN_RING(chan, tesla, NV50TCL_VERTEX_END, 1);
                        OUT_RING  (chan, 0);
                } while (!done);