From c0f88ed8a860026e32ec6a06287fcf9394b4cf0a Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 28 Jan 2019 21:08:24 +1100 Subject: Cleanup: sort forward declarations of enum & struct Done using: source/tools/utils_maintenance/c_sort_blocks.py --- source/blender/draw/DRW_engine.h | 28 +++++++++++----------- .../blender/draw/engines/eevee/eevee_lightcache.h | 10 ++++---- source/blender/draw/engines/eevee/eevee_private.h | 4 ++-- .../blender/draw/engines/gpencil/gpencil_engine.h | 8 +++---- source/blender/draw/intern/DRW_render.h | 18 +++++++------- source/blender/draw/intern/draw_cache_impl.h | 6 ++--- source/blender/draw/intern/draw_common.h | 6 ++--- source/blender/draw/intern/draw_hair_private.h | 4 ++-- 8 files changed, 42 insertions(+), 42 deletions(-) (limited to 'source/blender/draw') diff --git a/source/blender/draw/DRW_engine.h b/source/blender/draw/DRW_engine.h index 3daabd11df9..3ec56a21983 100644 --- a/source/blender/draw/DRW_engine.h +++ b/source/blender/draw/DRW_engine.h @@ -33,28 +33,28 @@ struct ARegion; struct CollectionEngineSettings; -struct Depsgraph; -struct DRWPass; struct DRWInstanceDataList; -struct Main; -struct Material; -struct Scene; +struct DRWPass; +struct Depsgraph; struct DrawEngineType; -struct ID; -struct IDProperty; -struct bContext; -struct Object; -struct ViewLayer; -struct ViewContext; -struct ViewportEngineData; -struct View3D; -struct rcti; struct GPUMaterial; struct GPUOffScreen; struct GPUViewport; +struct ID; +struct IDProperty; +struct Main; +struct Material; +struct Object; struct RenderEngine; struct RenderEngineType; +struct Scene; +struct View3D; +struct ViewContext; +struct ViewLayer; +struct ViewportEngineData; struct WorkSpace; +struct bContext; +struct rcti; #include "DNA_object_enums.h" diff --git a/source/blender/draw/engines/eevee/eevee_lightcache.h b/source/blender/draw/engines/eevee/eevee_lightcache.h index 846932661be..2c570399f12 100644 --- a/source/blender/draw/engines/eevee/eevee_lightcache.h +++ b/source/blender/draw/engines/eevee/eevee_lightcache.h @@ -31,13 +31,13 @@ #include "BLI_sys_types.h" /* for bool */ -struct ViewLayer; -struct Scene; -struct SceneEEVEE; -struct LightCache; -struct EEVEE_ViewLayerData; struct EEVEE_Data; struct EEVEE_LightBake; +struct EEVEE_ViewLayerData; +struct LightCache; +struct Scene; +struct SceneEEVEE; +struct ViewLayer; /* Light Bake */ struct wmJob *EEVEE_lightbake_job_create( diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h index acefb6b725a..e5c29f371a8 100644 --- a/source/blender/draw/engines/eevee/eevee_private.h +++ b/source/blender/draw/engines/eevee/eevee_private.h @@ -31,12 +31,12 @@ #include "DNA_lightprobe_types.h" -struct Object; struct EEVEE_BoundSphere; struct EEVEE_ShadowCasterBuffer; +struct GPUFrameBuffer; +struct Object; struct RenderLayer; struct RenderResult; -struct GPUFrameBuffer; extern struct DrawEngineType draw_engine_eevee_type; diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.h b/source/blender/draw/engines/gpencil/gpencil_engine.h index f6deeae062b..b8dde73accc 100644 --- a/source/blender/draw/engines/gpencil/gpencil_engine.h +++ b/source/blender/draw/engines/gpencil/gpencil_engine.h @@ -31,15 +31,15 @@ #include "GPU_batch.h" -struct tGPspoint; -struct bGPDstroke; -struct ModifierData; struct GPENCIL_Data; struct GPENCIL_StorageList; -struct Object; struct MaterialGPencilStyle; +struct ModifierData; +struct Object; struct RenderEngine; struct RenderLayer; +struct bGPDstroke; +struct tGPspoint; #define GPENCIL_CACHE_BLOCK_SIZE 8 #define GPENCIL_MAX_SHGROUPS 65536 diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h index 884b35c4acb..5bda5bc58b4 100644 --- a/source/blender/draw/intern/DRW_render.h +++ b/source/blender/draw/intern/DRW_render.h @@ -66,28 +66,28 @@ #include "DEG_depsgraph.h" -struct rcti; -struct bContext; +struct DRWTextStore; +struct DefaultFramebufferList; +struct DefaultTextureList; +struct GPUBatch; struct GPUFrameBuffer; -struct GPUShader; struct GPUMaterial; +struct GPUShader; struct GPUTexture; struct GPUUniformBuffer; -struct Object; -struct GPUBatch; -struct DefaultFramebufferList; -struct DefaultTextureList; -struct DRWTextStore; struct LampEngineData; +struct Object; struct ParticleSystem; struct RenderEngineType; struct ViewportEngineData; struct ViewportEngineData_Info; +struct bContext; +struct rcti; -typedef struct DRWUniform DRWUniform; typedef struct DRWInterface DRWInterface; typedef struct DRWPass DRWPass; typedef struct DRWShadingGroup DRWShadingGroup; +typedef struct DRWUniform DRWUniform; /* TODO Put it somewhere else? */ typedef struct BoundSphere { diff --git a/source/blender/draw/intern/draw_cache_impl.h b/source/blender/draw/intern/draw_cache_impl.h index aec0b35c672..9328d050163 100644 --- a/source/blender/draw/intern/draw_cache_impl.h +++ b/source/blender/draw/intern/draw_cache_impl.h @@ -30,15 +30,15 @@ #define __DRAW_CACHE_IMPL_H__ struct CurveCache; -struct GPUMaterial; -struct GPUTexture; struct GPUBatch; struct GPUIndexBuf; +struct GPUMaterial; +struct GPUTexture; struct GPUVertBuf; struct ListBase; struct ModifierData; -struct ParticleSystem; struct PTCacheEdit; +struct ParticleSystem; struct SpaceImage; struct ToolSettings; diff --git a/source/blender/draw/intern/draw_common.h b/source/blender/draw/intern/draw_common.h index 3beab5fe7bb..644e81e2f13 100644 --- a/source/blender/draw/intern/draw_common.h +++ b/source/blender/draw/intern/draw_common.h @@ -33,11 +33,11 @@ struct DRWPass; struct DRWShadingGroup; struct GPUBatch; struct GPUMaterial; -struct Object; -struct ViewLayer; struct ModifierData; -struct ParticleSystem; +struct Object; struct PTCacheEdit; +struct ParticleSystem; +struct ViewLayer; /** * Support selecting shaders with different options compiled in. diff --git a/source/blender/draw/intern/draw_hair_private.h b/source/blender/draw/intern/draw_hair_private.h index 41f91e02459..7fa69ee86fe 100644 --- a/source/blender/draw/intern/draw_hair_private.h +++ b/source/blender/draw/intern/draw_hair_private.h @@ -35,10 +35,10 @@ #define MAX_THICKRES 2 /* see eHairType */ #define MAX_HAIR_SUBDIV 4 /* see hair_subdiv rna */ -struct Object; -struct ParticleSystem; struct ModifierData; +struct Object; struct ParticleHairCache; +struct ParticleSystem; typedef struct ParticleHairFinalCache { /* Output of the subdivision stage: vertex buff sized to subdiv level. */ -- cgit v1.2.3