From 91694b9b58ab953f3b313be9389cc1303e472fc2 Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Fri, 7 Aug 2020 09:50:34 +0200 Subject: Code Style: use "#pragma once" in source directory This replaces header include guards with `#pragma once`. A couple of include guards are not removed yet (e.g. `__RNA_TYPES_H__`), because they are used in other places. This patch has been generated by P1561 followed by `make format`. Differential Revision: https://developer.blender.org/D8466 --- source/blender/draw/intern/DRW_render.h | 5 +---- source/blender/draw/intern/draw_cache.h | 5 +---- source/blender/draw/intern/draw_cache_extract.h | 5 +---- source/blender/draw/intern/draw_cache_impl.h | 5 +---- source/blender/draw/intern/draw_cache_inline.h | 5 +---- source/blender/draw/intern/draw_color_management.h | 5 +---- source/blender/draw/intern/draw_common.h | 5 +---- source/blender/draw/intern/draw_debug.h | 5 +---- source/blender/draw/intern/draw_hair_private.h | 5 +---- source/blender/draw/intern/draw_instance_data.h | 5 +---- source/blender/draw/intern/draw_manager.h | 5 +---- source/blender/draw/intern/draw_manager_profiling.h | 5 +---- source/blender/draw/intern/draw_manager_text.h | 5 +---- source/blender/draw/intern/draw_view.h | 5 +---- source/blender/draw/intern/smaa_textures.h | 4 +--- 15 files changed, 15 insertions(+), 59 deletions(-) (limited to 'source/blender/draw/intern') diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h index 16e6269aad6..ab6ea53261f 100644 --- a/source/blender/draw/intern/DRW_render.h +++ b/source/blender/draw/intern/DRW_render.h @@ -22,8 +22,7 @@ /* This is the Render Functions used by Realtime engines to draw with OpenGL */ -#ifndef __DRW_RENDER_H__ -#define __DRW_RENDER_H__ +#pragma once #include "DRW_engine_types.h" @@ -740,5 +739,3 @@ typedef struct DRWContextState { } DRWContextState; const DRWContextState *DRW_context_state_get(void); - -#endif /* __DRW_RENDER_H__ */ diff --git a/source/blender/draw/intern/draw_cache.h b/source/blender/draw/intern/draw_cache.h index 1ea53c91cb3..2a7448ce877 100644 --- a/source/blender/draw/intern/draw_cache.h +++ b/source/blender/draw/intern/draw_cache.h @@ -20,8 +20,7 @@ * \ingroup draw */ -#ifndef __DRAW_CACHE_H__ -#define __DRAW_CACHE_H__ +#pragma once struct GPUBatch; struct GPUMaterial; @@ -251,5 +250,3 @@ struct GPUBatch *DRW_cache_gpencil_face_wireframe_get(struct Object *ob); struct bGPDstroke *DRW_cache_gpencil_sbuffer_stroke_data_get(struct Object *ob); void DRW_cache_gpencil_sbuffer_clear(struct Object *ob); - -#endif /* __DRAW_CACHE_H__ */ diff --git a/source/blender/draw/intern/draw_cache_extract.h b/source/blender/draw/intern/draw_cache_extract.h index 4156e2e79d8..2653b3127ae 100644 --- a/source/blender/draw/intern/draw_cache_extract.h +++ b/source/blender/draw/intern/draw_cache_extract.h @@ -20,8 +20,7 @@ * \ingroup draw */ -#ifndef __DRAW_CACHE_EXTRACT_H__ -#define __DRAW_CACHE_EXTRACT_H__ +#pragma once struct TaskGraph; @@ -269,5 +268,3 @@ void mesh_buffer_cache_create_requested(struct TaskGraph *task_graph, const Scene *scene, const ToolSettings *ts, const bool use_hide); - -#endif /* __DRAW_CACHE_EXTRACT_H__ */ diff --git a/source/blender/draw/intern/draw_cache_impl.h b/source/blender/draw/intern/draw_cache_impl.h index 96d351794e6..784e52cfa17 100644 --- a/source/blender/draw/intern/draw_cache_impl.h +++ b/source/blender/draw/intern/draw_cache_impl.h @@ -20,8 +20,7 @@ * \ingroup draw */ -#ifndef __DRAW_CACHE_IMPL_H__ -#define __DRAW_CACHE_IMPL_H__ +#pragma once struct GPUBatch; struct GPUIndexBuf; @@ -254,5 +253,3 @@ struct GPUBatch *DRW_particles_batch_cache_get_edit_inner_points(struct Object * struct GPUBatch *DRW_particles_batch_cache_get_edit_tip_points(struct Object *object, struct ParticleSystem *psys, struct PTCacheEdit *edit); - -#endif /* __DRAW_CACHE_IMPL_H__ */ diff --git a/source/blender/draw/intern/draw_cache_inline.h b/source/blender/draw/intern/draw_cache_inline.h index 67f44b5fb0c..bb3a908c6c5 100644 --- a/source/blender/draw/intern/draw_cache_inline.h +++ b/source/blender/draw/intern/draw_cache_inline.h @@ -20,8 +20,7 @@ * \ingroup draw */ -#ifndef __DRAW_CACHE_INLINE_H__ -#define __DRAW_CACHE_INLINE_H__ +#pragma once #include "GPU_batch.h" #include "MEM_guardedalloc.h" @@ -110,5 +109,3 @@ BLI_INLINE bool DRW_vbo_requested(GPUVertBuf *vbo) { return (vbo != NULL && vbo->format.attr_len == 0); } - -#endif /* __DRAW_CACHE_INLINE_H__ */ diff --git a/source/blender/draw/intern/draw_color_management.h b/source/blender/draw/intern/draw_color_management.h index 9d83eccdce9..3150ec72138 100644 --- a/source/blender/draw/intern/draw_color_management.h +++ b/source/blender/draw/intern/draw_color_management.h @@ -20,9 +20,6 @@ * \ingroup draw */ -#ifndef __DRAW_COLOR_MANAGEMENT_H__ -#define __DRAW_COLOR_MANAGEMENT_H__ +#pragma once void DRW_transform_none(struct GPUTexture *tex); - -#endif /* __DRAW_COLOR_MANAGEMENT_H__ */ diff --git a/source/blender/draw/intern/draw_common.h b/source/blender/draw/intern/draw_common.h index 81c0e97a1a8..d7bb9b78e09 100644 --- a/source/blender/draw/intern/draw_common.h +++ b/source/blender/draw/intern/draw_common.h @@ -20,8 +20,7 @@ * \ingroup draw */ -#ifndef __DRAW_COMMON_H__ -#define __DRAW_COMMON_H__ +#pragma once struct DRWPass; struct DRWShadingGroup; @@ -203,5 +202,3 @@ struct DRW_Global { struct GPUUniformBuffer *view_ubo; }; extern struct DRW_Global G_draw; - -#endif /* __DRAW_COMMON_H__ */ diff --git a/source/blender/draw/intern/draw_debug.h b/source/blender/draw/intern/draw_debug.h index e7404b17384..149825974d4 100644 --- a/source/blender/draw/intern/draw_debug.h +++ b/source/blender/draw/intern/draw_debug.h @@ -20,8 +20,7 @@ * \ingroup draw */ -#ifndef __DRAW_DEBUG_H__ -#define __DRAW_DEBUG_H__ +#pragma once struct BoundBox; @@ -34,5 +33,3 @@ void DRW_debug_m4(const float m[4][4]); void DRW_debug_m4_as_bbox(const float m[4][4], const float color[4], const bool invert); void DRW_debug_bbox(const BoundBox *bbox, const float color[4]); void DRW_debug_sphere(const float center[3], const float radius, const float color[4]); - -#endif /* __DRAW_DEBUG_H__ */ diff --git a/source/blender/draw/intern/draw_hair_private.h b/source/blender/draw/intern/draw_hair_private.h index b599ad389c1..33abae156cc 100644 --- a/source/blender/draw/intern/draw_hair_private.h +++ b/source/blender/draw/intern/draw_hair_private.h @@ -21,8 +21,7 @@ * \ingroup draw */ -#ifndef __DRAW_HAIR_PRIVATE_H__ -#define __DRAW_HAIR_PRIVATE_H__ +#pragma once #define MAX_LAYER_NAME_CT 4 /* u0123456789, u, au, a0123456789 */ #define MAX_LAYER_NAME_LEN GPU_MAX_SAFE_ATTR_NAME + 2 @@ -92,5 +91,3 @@ bool hair_ensure_procedural_data(struct Object *object, struct ParticleHairCache **r_hair_cache, int subdiv, int thickness_res); - -#endif /* __DRAW_HAIR_PRIVATE_H__ */ diff --git a/source/blender/draw/intern/draw_instance_data.h b/source/blender/draw/intern/draw_instance_data.h index f891d380ee3..e562d99097e 100644 --- a/source/blender/draw/intern/draw_instance_data.h +++ b/source/blender/draw/intern/draw_instance_data.h @@ -20,8 +20,7 @@ * \ingroup draw */ -#ifndef __DRAW_INSTANCE_DATA_H__ -#define __DRAW_INSTANCE_DATA_H__ +#pragma once #include "BLI_compiler_attrs.h" #include "BLI_sys_types.h" @@ -55,5 +54,3 @@ void DRW_instance_buffer_finish(DRWInstanceDataList *idatalist); void DRW_instance_data_list_reset(DRWInstanceDataList *idatalist); void DRW_instance_data_list_free_unused(DRWInstanceDataList *idatalist); void DRW_instance_data_list_resize(DRWInstanceDataList *idatalist); - -#endif /* __DRAW_INSTANCE_DATA_H__ */ diff --git a/source/blender/draw/intern/draw_manager.h b/source/blender/draw/intern/draw_manager.h index a448a94185a..92a01cbbe04 100644 --- a/source/blender/draw/intern/draw_manager.h +++ b/source/blender/draw/intern/draw_manager.h @@ -22,8 +22,7 @@ /* Private functions / structs of the draw manager */ -#ifndef __DRAW_MANAGER_H__ -#define __DRAW_MANAGER_H__ +#pragma once #include "DRW_engine.h" #include "DRW_render.h" @@ -596,5 +595,3 @@ void drw_resource_buffer_finish(ViewportMemoryPool *vmempool); GPUBatch *drw_cache_procedural_points_get(void); GPUBatch *drw_cache_procedural_lines_get(void); GPUBatch *drw_cache_procedural_triangles_get(void); - -#endif /* __DRAW_MANAGER_H__ */ diff --git a/source/blender/draw/intern/draw_manager_profiling.h b/source/blender/draw/intern/draw_manager_profiling.h index 3da6a4c8b1c..3842bdffaff 100644 --- a/source/blender/draw/intern/draw_manager_profiling.h +++ b/source/blender/draw/intern/draw_manager_profiling.h @@ -20,8 +20,7 @@ * \ingroup draw */ -#ifndef __DRAW_MANAGER_PROFILING_H__ -#define __DRAW_MANAGER_PROFILING_H__ +#pragma once struct rcti; @@ -36,5 +35,3 @@ void DRW_stats_query_start(const char *name); void DRW_stats_query_end(void); void DRW_stats_draw(const rcti *rect); - -#endif /* __DRAW_MANAGER_PROFILING_H__ */ diff --git a/source/blender/draw/intern/draw_manager_text.h b/source/blender/draw/intern/draw_manager_text.h index 66ef2379e38..f6dff335f1f 100644 --- a/source/blender/draw/intern/draw_manager_text.h +++ b/source/blender/draw/intern/draw_manager_text.h @@ -20,8 +20,7 @@ * \ingroup draw */ -#ifndef __DRAW_MANAGER_TEXT_H__ -#define __DRAW_MANAGER_TEXT_H__ +#pragma once struct ARegion; struct DRWTextStore; @@ -58,5 +57,3 @@ enum { /* draw_manager.c */ struct DRWTextStore *DRW_text_cache_ensure(void); - -#endif /* __DRAW_MANAGER_TEXT_H__ */ diff --git a/source/blender/draw/intern/draw_view.h b/source/blender/draw/intern/draw_view.h index 04f7d2bbabb..a01a2d0dcce 100644 --- a/source/blender/draw/intern/draw_view.h +++ b/source/blender/draw/intern/draw_view.h @@ -20,13 +20,10 @@ * \ingroup draw */ -#ifndef __DRAW_VIEW_H__ -#define __DRAW_VIEW_H__ +#pragma once void DRW_draw_region_info(void); void DRW_clear_background(void); void DRW_draw_cursor(void); void DRW_draw_gizmo_3d(void); void DRW_draw_gizmo_2d(void); - -#endif /* __DRAW_VIEW_H__ */ diff --git a/source/blender/draw/intern/smaa_textures.h b/source/blender/draw/intern/smaa_textures.h index 43b29340cac..7556f3a1952 100644 --- a/source/blender/draw/intern/smaa_textures.h +++ b/source/blender/draw/intern/smaa_textures.h @@ -26,8 +26,7 @@ * SOFTWARE. */ -#ifndef __SMAA_TEXTURES_H__ -#define __SMAA_TEXTURES_H__ +#pragma once #define AREATEX_WIDTH 160 #define AREATEX_HEIGHT 560 @@ -15083,4 +15082,3 @@ static const unsigned char searchTexBytes[] = { /* clang-format off */ -#endif /* __SMAA_TEXTURES_H__ */ -- cgit v1.2.3