u_vbuf_mgr: rename to u_vbuf

7 files changed, 30 insertions, 30 deletions

diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources
index baded909cec..f1f3696d005 100644
--- a/src/gallium/auxiliary/Makefile.sources
+++ b/src/gallium/auxiliary/Makefile.sources
@@ -139,7 +139,7 @@ C_SOURCES := \
 	util/u_transfer.c \
 	util/u_resource.c \
 	util/u_upload_mgr.c \
-	util/u_vbuf_mgr.c \
+	util/u_vbuf.c \
 	vl/vl_csc.c \
 	vl/vl_compositor.c \
 	vl/vl_decoder.c \
diff --git a/src/gallium/auxiliary/util/u_vbuf_mgr.c b/src/gallium/auxiliary/util/u_vbuf.c
index 83113f72d18..f6da9120343 100644
--- a/src/gallium/auxiliary/util/u_vbuf_mgr.c
+++ b/src/gallium/auxiliary/util/u_vbuf.c
@@ -25,7 +25,7 @@
  *
  **************************************************************************/
 
-#include "util/u_vbuf_mgr.h"
+#include "util/u_vbuf.h"
 
 #include "util/u_format.h"
 #include "util/u_inlines.h"
@@ -55,7 +55,7 @@ struct u_vbuf_elements {
 };
 
 struct u_vbuf_priv {
-   struct u_vbuf_mgr b;
+   struct u_vbuf b;
    struct pipe_context *pipe;
    struct translate_cache *translate_cache;
 
@@ -113,7 +113,7 @@ static void u_vbuf_init_format_caps(struct u_vbuf_priv *mgr)
                                   0, PIPE_BIND_VERTEX_BUFFER);
 }
 
-struct u_vbuf_mgr *
+struct u_vbuf *
 u_vbuf_create(struct pipe_context *pipe,
               unsigned upload_buffer_size,
               unsigned upload_buffer_alignment,
@@ -138,7 +138,7 @@ u_vbuf_create(struct pipe_context *pipe,
    return &mgr->b;
 }
 
-void u_vbuf_destroy(struct u_vbuf_mgr *mgrb)
+void u_vbuf_destroy(struct u_vbuf *mgrb)
 {
    struct u_vbuf_priv *mgr = (struct u_vbuf_priv*)mgrb;
    unsigned i;
@@ -351,7 +351,7 @@ static void u_vbuf_translate_end(struct u_vbuf_priv *mgr)
     case PIPE_FORMAT_##what: format = PIPE_FORMAT_##withwhat; break
 
 struct u_vbuf_elements *
-u_vbuf_create_vertex_elements(struct u_vbuf_mgr *mgrb,
+u_vbuf_create_vertex_elements(struct u_vbuf *mgrb,
                               unsigned count,
                               const struct pipe_vertex_element *attribs,
                               struct pipe_vertex_element *native_attribs)
@@ -456,7 +456,7 @@ u_vbuf_create_vertex_elements(struct u_vbuf_mgr *mgrb,
    return ve;
 }
 
-void u_vbuf_bind_vertex_elements(struct u_vbuf_mgr *mgrb,
+void u_vbuf_bind_vertex_elements(struct u_vbuf *mgrb,
                                  void *cso,
                                  struct u_vbuf_elements *ve)
 {
@@ -472,13 +472,13 @@ void u_vbuf_bind_vertex_elements(struct u_vbuf_mgr *mgrb,
    }
 }
 
-void u_vbuf_destroy_vertex_elements(struct u_vbuf_mgr *mgr,
+void u_vbuf_destroy_vertex_elements(struct u_vbuf *mgr,
                                     struct u_vbuf_elements *ve)
 {
    FREE(ve);
 }
 
-void u_vbuf_set_vertex_buffers(struct u_vbuf_mgr *mgrb,
+void u_vbuf_set_vertex_buffers(struct u_vbuf *mgrb,
                                unsigned count,
                                const struct pipe_vertex_buffer *bufs)
 {
@@ -539,7 +539,7 @@ void u_vbuf_set_vertex_buffers(struct u_vbuf_mgr *mgrb,
    mgr->b.nr_real_vertex_buffers = count;
 }
 
-void u_vbuf_set_index_buffer(struct u_vbuf_mgr *mgr,
+void u_vbuf_set_index_buffer(struct u_vbuf *mgr,
                              const struct pipe_index_buffer *ib)
 {
    if (ib && ib->buffer) {
@@ -636,7 +636,7 @@ u_vbuf_upload_buffers(struct u_vbuf_priv *mgr,
    }
 }
 
-unsigned u_vbuf_draw_max_vertex_count(struct u_vbuf_mgr *mgrb)
+unsigned u_vbuf_draw_max_vertex_count(struct u_vbuf *mgrb)
 {
    struct u_vbuf_priv *mgr = (struct u_vbuf_priv*)mgrb;
    unsigned i, nr = mgr->ve->count;
@@ -816,7 +816,7 @@ static void u_vbuf_get_minmax_index(struct pipe_context *pipe,
 }
 
 enum u_vbuf_return_flags
-u_vbuf_draw_begin(struct u_vbuf_mgr *mgrb,
+u_vbuf_draw_begin(struct u_vbuf *mgrb,
                   const struct pipe_draw_info *info)
 {
    struct u_vbuf_priv *mgr = (struct u_vbuf_priv*)mgrb;
@@ -858,7 +858,7 @@ u_vbuf_draw_begin(struct u_vbuf_mgr *mgrb,
    return U_VBUF_BUFFERS_UPDATED;
 }
 
-void u_vbuf_draw_end(struct u_vbuf_mgr *mgrb)
+void u_vbuf_draw_end(struct u_vbuf *mgrb)
 {
    struct u_vbuf_priv *mgr = (struct u_vbuf_priv*)mgrb;
 
diff --git a/src/gallium/auxiliary/util/u_vbuf_mgr.h b/src/gallium/auxiliary/util/u_vbuf.h
index 42ca0ac35a4..57b93ddea6b 100644
--- a/src/gallium/auxiliary/util/u_vbuf_mgr.h
+++ b/src/gallium/auxiliary/util/u_vbuf.h
@@ -55,7 +55,7 @@ struct u_vbuf_caps {
 /* The manager.
  * This structure should also be used to access vertex buffers
  * from a driver. */
-struct u_vbuf_mgr {
+struct u_vbuf {
    /* This is what was set in set_vertex_buffers.
     * May contain user buffers. */
    struct pipe_vertex_buffer vertex_buffer[PIPE_MAX_ATTRIBS];
@@ -100,41 +100,41 @@ enum u_vbuf_return_flags {
 };
 
 
-struct u_vbuf_mgr *
+struct u_vbuf *
 u_vbuf_create(struct pipe_context *pipe,
               unsigned upload_buffer_size,
               unsigned upload_buffer_alignment,
               unsigned upload_buffer_bind,
               enum u_fetch_alignment fetch_alignment);
 
-void u_vbuf_destroy(struct u_vbuf_mgr *mgr);
+void u_vbuf_destroy(struct u_vbuf *mgr);
 
 struct u_vbuf_elements *
-u_vbuf_create_vertex_elements(struct u_vbuf_mgr *mgr,
+u_vbuf_create_vertex_elements(struct u_vbuf *mgr,
                               unsigned count,
                               const struct pipe_vertex_element *attrs,
                               struct pipe_vertex_element *native_attrs);
 
-void u_vbuf_bind_vertex_elements(struct u_vbuf_mgr *mgr,
+void u_vbuf_bind_vertex_elements(struct u_vbuf *mgr,
                                  void *cso,
                                  struct u_vbuf_elements *ve);
 
-void u_vbuf_destroy_vertex_elements(struct u_vbuf_mgr *mgr,
+void u_vbuf_destroy_vertex_elements(struct u_vbuf *mgr,
                                     struct u_vbuf_elements *ve);
 
-void u_vbuf_set_vertex_buffers(struct u_vbuf_mgr *mgr,
+void u_vbuf_set_vertex_buffers(struct u_vbuf *mgr,
                                unsigned count,
                                const struct pipe_vertex_buffer *bufs);
 
-void u_vbuf_set_index_buffer(struct u_vbuf_mgr *mgr,
+void u_vbuf_set_index_buffer(struct u_vbuf *mgr,
                              const struct pipe_index_buffer *ib);
 
-enum u_vbuf_return_flags u_vbuf_draw_begin(struct u_vbuf_mgr *mgr,
+enum u_vbuf_return_flags u_vbuf_draw_begin(struct u_vbuf *mgr,
                                            const struct pipe_draw_info *info);
 
-unsigned u_vbuf_draw_max_vertex_count(struct u_vbuf_mgr *mgr);
+unsigned u_vbuf_draw_max_vertex_count(struct u_vbuf *mgr);
 
-void u_vbuf_draw_end(struct u_vbuf_mgr *mgr);
+void u_vbuf_draw_end(struct u_vbuf *mgr);
 
 
 static INLINE struct u_vbuf_resource *u_vbuf_resource(struct pipe_resource *r)
diff --git a/src/gallium/drivers/r300/r300_context.h b/src/gallium/drivers/r300/r300_context.h
index 4909b7e7540..e1c12d9c516 100644
--- a/src/gallium/drivers/r300/r300_context.h
+++ b/src/gallium/drivers/r300/r300_context.h
@@ -30,7 +30,7 @@
 #include "pipe/p_context.h"
 #include "util/u_inlines.h"
 #include "util/u_transfer.h"
-#include "util/u_vbuf_mgr.h"
+#include "util/u_vbuf.h"
 
 #include "r300_defines.h"
 #include "r300_screen.h"
@@ -580,7 +580,7 @@ struct r300_context {
 
     void *dsa_decompress_zmask;
 
-    struct u_vbuf_mgr *vbuf_mgr;
+    struct u_vbuf *vbuf_mgr;
 
     struct util_slab_mempool pool_transfers;
 
diff --git a/src/gallium/drivers/r600/r600.h b/src/gallium/drivers/r600/r600.h
index f04bcae1e51..e697406aaaf 100644
--- a/src/gallium/drivers/r600/r600.h
+++ b/src/gallium/drivers/r600/r600.h
@@ -28,7 +28,7 @@
 
 #include "../../winsys/radeon/drm/radeon_winsys.h"
 #include "util/u_double_list.h"
-#include "util/u_vbuf_mgr.h"
+#include "util/u_vbuf.h"
 
 #define R600_ERR(fmt, args...) \
 	fprintf(stderr, "EE %s:%d %s - "fmt, __FILE__, __LINE__, __func__, ##args)
diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h
index d5bb298418f..a127eed6f38 100644
--- a/src/gallium/drivers/r600/r600_pipe.h
+++ b/src/gallium/drivers/r600/r600_pipe.h
@@ -33,7 +33,7 @@
 #include "pipe/p_context.h"
 #include "util/u_math.h"
 #include "util/u_slab.h"
-#include "util/u_vbuf_mgr.h"
+#include "util/u_vbuf.h"
 #include "r600.h"
 #include "r600_public.h"
 #include "r600_shader.h"
@@ -224,7 +224,7 @@ struct r600_pipe_context {
 
 	struct r600_pipe_fences		fences;
 
-	struct u_vbuf_mgr		*vbuf_mgr;
+	struct u_vbuf			*vbuf_mgr;
 	struct util_slab_mempool	pool_transfers;
 	boolean				have_depth_texture, have_depth_fb;
 
diff --git a/src/gallium/drivers/r600/r600_resource.h b/src/gallium/drivers/r600/r600_resource.h
index ee10f3447ed..1ca67298d05 100644
--- a/src/gallium/drivers/r600/r600_resource.h
+++ b/src/gallium/drivers/r600/r600_resource.h
@@ -24,7 +24,7 @@
 #define R600_RESOURCE_H
 
 #include "util/u_transfer.h"
-#include "util/u_vbuf_mgr.h"
+#include "util/u_vbuf.h"
 
 /* flag to indicate a resource is to be used as a transfer so should not be tiled */
 #define R600_RESOURCE_FLAG_TRANSFER     PIPE_RESOURCE_FLAG_DRV_PRIV