1 files changed, 38 insertions, 38 deletions

diff --git a/src/gbm/main/gbm.h b/src/gbm/main/gbm.h
index 1a1e2caecb4..9655c6e9629 100644
--- a/src/gbm/main/gbm.h
+++ b/src/gbm/main/gbm.h
@@ -267,40 +267,40 @@ enum gbm_bo_flags {
 };
 
 int
-gbm_device_get_fd(struct gbm_device *gbm);
+gbm_mesa_device_get_fd(struct gbm_device *gbm);
 
 const char *
-gbm_device_get_backend_name(struct gbm_device *gbm);
+gbm_mesa_device_get_backend_name(struct gbm_device *gbm);
 
 int
-gbm_device_is_format_supported(struct gbm_device *gbm,
+gbm_mesa_device_is_format_supported(struct gbm_device *gbm,
                                uint32_t format, uint32_t flags);
 
 int
-gbm_device_get_format_modifier_plane_count(struct gbm_device *gbm,
+gbm_mesa_device_get_format_modifier_plane_count(struct gbm_device *gbm,
                                            uint32_t format,
                                            uint64_t modifier);
 
 void
-gbm_device_destroy(struct gbm_device *gbm);
+gbm_mesa_device_destroy(struct gbm_device *gbm);
 
 struct gbm_device *
-gbm_create_device(int fd);
+gbm_mesa_create_device(int fd);
 
 struct gbm_bo *
-gbm_bo_create(struct gbm_device *gbm,
+gbm_mesa_bo_create(struct gbm_device *gbm,
               uint32_t width, uint32_t height,
               uint32_t format, uint32_t flags);
 
 struct gbm_bo *
-gbm_bo_create_with_modifiers(struct gbm_device *gbm,
+gbm_mesa_bo_create_with_modifiers(struct gbm_device *gbm,
                              uint32_t width, uint32_t height,
                              uint32_t format,
                              const uint64_t *modifiers,
                              const unsigned int count);
 
 struct gbm_bo *
-gbm_bo_create_with_modifiers2(struct gbm_device *gbm,
+gbm_mesa_bo_create_with_modifiers2(struct gbm_device *gbm,
                               uint32_t width, uint32_t height,
                               uint32_t format,
                               const uint64_t *modifiers,
@@ -334,7 +334,7 @@ struct gbm_import_fd_modifier_data {
 };
 
 struct gbm_bo *
-gbm_bo_import(struct gbm_device *gbm, uint32_t type,
+gbm_mesa_bo_import(struct gbm_device *gbm, uint32_t type,
               void *buffer, uint32_t flags);
 
 /**
@@ -365,82 +365,82 @@ enum gbm_bo_transfer_flags {
 };
 
 void *
-gbm_bo_map(struct gbm_bo *bo,
+gbm_mesa_bo_map(struct gbm_bo *bo,
            uint32_t x, uint32_t y, uint32_t width, uint32_t height,
            uint32_t flags, uint32_t *stride, void **map_data);
 
 void
-gbm_bo_unmap(struct gbm_bo *bo, void *map_data);
+gbm_mesa_bo_unmap(struct gbm_bo *bo, void *map_data);
 
 uint32_t
-gbm_bo_get_width(struct gbm_bo *bo);
+gbm_mesa_bo_get_width(struct gbm_bo *bo);
 
 uint32_t
-gbm_bo_get_height(struct gbm_bo *bo);
+gbm_mesa_bo_get_height(struct gbm_bo *bo);
 
 uint32_t
-gbm_bo_get_stride(struct gbm_bo *bo);
+gbm_mesa_bo_get_stride(struct gbm_bo *bo);
 
 uint32_t
-gbm_bo_get_stride_for_plane(struct gbm_bo *bo, int plane);
+gbm_mesa_bo_get_stride_for_plane(struct gbm_bo *bo, int plane);
 
 uint32_t
-gbm_bo_get_format(struct gbm_bo *bo);
+gbm_mesa_bo_get_format(struct gbm_bo *bo);
 
 uint32_t
-gbm_bo_get_bpp(struct gbm_bo *bo);
+gbm_mesa_bo_get_bpp(struct gbm_bo *bo);
 
 uint32_t
-gbm_bo_get_offset(struct gbm_bo *bo, int plane);
+gbm_mesa_bo_get_offset(struct gbm_bo *bo, int plane);
 
 struct gbm_device *
-gbm_bo_get_device(struct gbm_bo *bo);
+gbm_mesa_bo_get_device(struct gbm_bo *bo);
 
 union gbm_bo_handle
-gbm_bo_get_handle(struct gbm_bo *bo);
+gbm_mesa_bo_get_handle(struct gbm_bo *bo);
 
 int
-gbm_bo_get_fd(struct gbm_bo *bo);
+gbm_mesa_bo_get_fd(struct gbm_bo *bo);
 
 uint64_t
-gbm_bo_get_modifier(struct gbm_bo *bo);
+gbm_mesa_bo_get_modifier(struct gbm_bo *bo);
 
 int
-gbm_bo_get_plane_count(struct gbm_bo *bo);
+gbm_mesa_bo_get_plane_count(struct gbm_bo *bo);
 
 union gbm_bo_handle
-gbm_bo_get_handle_for_plane(struct gbm_bo *bo, int plane);
+gbm_mesa_bo_get_handle_for_plane(struct gbm_bo *bo, int plane);
 
 int
-gbm_bo_get_fd_for_plane(struct gbm_bo *bo, int plane);
+gbm_mesa_bo_get_fd_for_plane(struct gbm_bo *bo, int plane);
 
 int
-gbm_bo_write(struct gbm_bo *bo, const void *buf, size_t count);
+gbm_mesa_bo_write(struct gbm_bo *bo, const void *buf, size_t count);
 
 void
-gbm_bo_set_user_data(struct gbm_bo *bo, void *data,
+gbm_mesa_bo_set_user_data(struct gbm_bo *bo, void *data,
 		     void (*destroy_user_data)(struct gbm_bo *, void *));
 
 void *
-gbm_bo_get_user_data(struct gbm_bo *bo);
+gbm_mesa_bo_get_user_data(struct gbm_bo *bo);
 
 void
-gbm_bo_destroy(struct gbm_bo *bo);
+gbm_mesa_bo_destroy(struct gbm_bo *bo);
 
 struct gbm_surface *
-gbm_surface_create(struct gbm_device *gbm,
+gbm_mesa_surface_create(struct gbm_device *gbm,
                    uint32_t width, uint32_t height,
 		   uint32_t format, uint32_t flags);
 
 struct gbm_surface *
-gbm_surface_create_with_modifiers(struct gbm_device *gbm,
+gbm_mesa_surface_create_with_modifiers(struct gbm_device *gbm,
                                   uint32_t width, uint32_t height,
                                   uint32_t format,
                                   const uint64_t *modifiers,
                                   const unsigned int count);
 
 struct gbm_surface *
-gbm_surface_create_with_modifiers2(struct gbm_device *gbm,
+gbm_mesa_surface_create_with_modifiers2(struct gbm_device *gbm,
                                    uint32_t width, uint32_t height,
                                    uint32_t format,
                                    const uint64_t *modifiers,
@@ -448,19 +448,19 @@ gbm_surface_create_with_modifiers2(struct gbm_device *gbm,
                                    uint32_t flags);
 
 struct gbm_bo *
-gbm_surface_lock_front_buffer(struct gbm_surface *surface);
+gbm_mesa_surface_lock_front_buffer(struct gbm_surface *surface);
 
 void
-gbm_surface_release_buffer(struct gbm_surface *surface, struct gbm_bo *bo);
+gbm_mesa_surface_release_buffer(struct gbm_surface *surface, struct gbm_bo *bo);
 
 int
-gbm_surface_has_free_buffers(struct gbm_surface *surface);
+gbm_mesa_surface_has_free_buffers(struct gbm_surface *surface);
 
 void
-gbm_surface_destroy(struct gbm_surface *surface);
+gbm_mesa_surface_destroy(struct gbm_surface *surface);
 
 char *
-gbm_format_get_name(uint32_t gbm_format, struct gbm_format_name_desc *desc);
+gbm_mesa_format_get_name(uint32_t gbm_format, struct gbm_format_name_desc *desc);
 
 #ifdef __cplusplus
 }