Mesa (master): v3d: rename header include guards

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 3c318e63357af805143049feb3e2e66fdca8923e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3c318e63357af805143049feb3e2e66fdca8923e

Author: Juan A. Suarez Romero <jasuarez at igalia.com>
Date:   Wed Apr 21 18:12:46 2021 +0200

v3d: rename header include guards

Long time ago VC5 was renamed to V3D, but the include guards `VC5_FOO_H`
were not.

In order to keep consistency, let's rename these guards from `VC5_FOO_H`
to `V3D_FOO_H`.

Reviewed-by: Alejandro Piñeiro <apinheiro at igalia.com>
Signed-off-by: Juan A. Suarez Romero <jasuarez at igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10402>

---

 src/gallium/drivers/v3d/v3d_bufmgr.h        | 6 +++---
 src/gallium/drivers/v3d/v3d_cl.h            | 6 +++---
 src/gallium/drivers/v3d/v3d_context.h       | 6 +++---
 src/gallium/drivers/v3d/v3d_resource.h      | 6 +++---
 src/gallium/drivers/v3d/v3d_screen.h        | 6 +++---
 src/gallium/drivers/v3d/v3d_tiling.h        | 6 +++---
 src/gallium/winsys/v3d/drm/v3d_drm_public.h | 6 +++---
 7 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/gallium/drivers/v3d/v3d_bufmgr.h b/src/gallium/drivers/v3d/v3d_bufmgr.h
index 9aa4d84a001..68d506ed26b 100644
--- a/src/gallium/drivers/v3d/v3d_bufmgr.h
+++ b/src/gallium/drivers/v3d/v3d_bufmgr.h
@@ -21,8 +21,8 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef VC5_BUFMGR_H
-#define VC5_BUFMGR_H
+#ifndef V3D_BUFMGR_H
+#define V3D_BUFMGR_H
 
 #include <stdint.h>
 #include "util/u_hash_table.h"
@@ -134,5 +134,5 @@ v3d_wait_seqno(struct v3d_screen *screen, uint64_t seqno, uint64_t timeout_ns,
 void
 v3d_bufmgr_destroy(struct pipe_screen *pscreen);
 
-#endif /* VC5_BUFMGR_H */
+#endif /* V3D_BUFMGR_H */
 
diff --git a/src/gallium/drivers/v3d/v3d_cl.h b/src/gallium/drivers/v3d/v3d_cl.h
index 271d407132a..45cb6bbe858 100644
--- a/src/gallium/drivers/v3d/v3d_cl.h
+++ b/src/gallium/drivers/v3d/v3d_cl.h
@@ -21,8 +21,8 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef VC5_CL_H
-#define VC5_CL_H
+#ifndef V3D_CL_H
+#define V3D_CL_H
 
 #include <stdint.h>
 
@@ -289,4 +289,4 @@ cl_pack_emit_reloc(struct v3d_cl *cl, const struct v3d_cl_reloc *reloc)
                 v3d_job_add_bo(cl->job, reloc->bo);
 }
 
-#endif /* VC5_CL_H */
+#endif /* V3D_CL_H */
diff --git a/src/gallium/drivers/v3d/v3d_context.h b/src/gallium/drivers/v3d/v3d_context.h
index cc26ed677ab..68e3fb339b4 100644
--- a/src/gallium/drivers/v3d/v3d_context.h
+++ b/src/gallium/drivers/v3d/v3d_context.h
@@ -22,8 +22,8 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef VC5_CONTEXT_H
-#define VC5_CONTEXT_H
+#ifndef V3D_CONTEXT_H
+#define V3D_CONTEXT_H
 
 #ifdef V3D_VERSION
 #include "broadcom/common/v3d_macros.h"
@@ -742,4 +742,4 @@ void v3d_get_tile_buffer_size(bool is_msaa,
 #  undef v3dX
 #endif
 
-#endif /* VC5_CONTEXT_H */
+#endif /* V3D_CONTEXT_H */
diff --git a/src/gallium/drivers/v3d/v3d_resource.h b/src/gallium/drivers/v3d/v3d_resource.h
index 8a9bf7099e6..d2a3e78b8f5 100644
--- a/src/gallium/drivers/v3d/v3d_resource.h
+++ b/src/gallium/drivers/v3d/v3d_resource.h
@@ -22,8 +22,8 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef VC5_RESOURCE_H
-#define VC5_RESOURCE_H
+#ifndef V3D_RESOURCE_H
+#define V3D_RESOURCE_H
 
 #include "v3d_screen.h"
 #include "util/u_transfer.h"
@@ -188,4 +188,4 @@ uint32_t v3d_layer_offset(struct pipe_resource *prsc, uint32_t level,
                           uint32_t layer);
 
 
-#endif /* VC5_RESOURCE_H */
+#endif /* V3D_RESOURCE_H */
diff --git a/src/gallium/drivers/v3d/v3d_screen.h b/src/gallium/drivers/v3d/v3d_screen.h
index 586b3925065..7a7bfa8fb00 100644
--- a/src/gallium/drivers/v3d/v3d_screen.h
+++ b/src/gallium/drivers/v3d/v3d_screen.h
@@ -21,8 +21,8 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef VC5_SCREEN_H
-#define VC5_SCREEN_H
+#ifndef V3D_SCREEN_H
+#define V3D_SCREEN_H
 
 #include "pipe/p_screen.h"
 #include "renderonly/renderonly.h"
@@ -97,4 +97,4 @@ struct pipe_screen *v3d_screen_create(int fd,
 void
 v3d_fence_init(struct v3d_screen *screen);
 
-#endif /* VC5_SCREEN_H */
+#endif /* V3D_SCREEN_H */
diff --git a/src/gallium/drivers/v3d/v3d_tiling.h b/src/gallium/drivers/v3d/v3d_tiling.h
index d04349108c9..214380c537a 100644
--- a/src/gallium/drivers/v3d/v3d_tiling.h
+++ b/src/gallium/drivers/v3d/v3d_tiling.h
@@ -21,8 +21,8 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef VC5_TILING_H
-#define VC5_TILING_H
+#ifndef V3D_TILING_H
+#define V3D_TILING_H
 
 uint32_t v3d_utile_width(int cpp) ATTRIBUTE_CONST;
 uint32_t v3d_utile_height(int cpp) ATTRIBUTE_CONST;
@@ -38,4 +38,4 @@ void v3d_store_tiled_image(void *dst, uint32_t dst_stride,
                            uint32_t image_h,
                            const struct pipe_box *box);
 
-#endif /* VC5_TILING_H */
+#endif /* V3D_TILING_H */
diff --git a/src/gallium/winsys/v3d/drm/v3d_drm_public.h b/src/gallium/winsys/v3d/drm/v3d_drm_public.h
index 4b8dd0b7804..c458d7395f1 100644
--- a/src/gallium/winsys/v3d/drm/v3d_drm_public.h
+++ b/src/gallium/winsys/v3d/drm/v3d_drm_public.h
@@ -21,8 +21,8 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef __VC5_DRM_PUBLIC_H__
-#define __VC5_DRM_PUBLIC_H__
+#ifndef __V3D_DRM_PUBLIC_H__
+#define __V3D_DRM_PUBLIC_H__
 
 struct pipe_screen;
 struct pipe_screen_config;
@@ -33,4 +33,4 @@ struct pipe_screen *v3d_drm_screen_create(int drmFD,
 struct pipe_screen *v3d_drm_screen_create_renderonly(struct renderonly *ro,
                                                      const struct pipe_screen_config *config);
 
-#endif /* __VC5_DRM_PUBLIC_H__ */
+#endif /* __V3D_DRM_PUBLIC_H__ */