diff options
| author | Marek Olšák <[email protected]> | 2011-11-22 20:43:21 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2011-11-22 20:56:51 +0100 |
| commit | fba685a0995e76f86af5920163297e5c3b32fb4b (patch) | |
| tree | c59f859813875dea474353fe91e088b445464ef7 /src/gallium/drivers | |
| parent | 611a8b82e3827dd7c256edd5c014f4d48cb045f0 (diff) | |
u_vbuf_mgr: rename to u_vbuf
Diffstat (limited to 'src/gallium/drivers')
| -rw-r--r-- | src/gallium/drivers/r300/r300_context.h | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600.h | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_pipe.h | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_resource.h | 2 |
4 files changed, 6 insertions, 6 deletions
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 |