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/gpu/GPU_batch_presets.h | 2 +- source/blender/gpu/GPU_draw.h | 8 ++++---- source/blender/gpu/GPU_material.h | 18 +++++++++--------- source/blender/gpu/GPU_texture.h | 2 +- source/blender/gpu/intern/gpu_codegen.h | 6 +++--- 5 files changed, 18 insertions(+), 18 deletions(-) (limited to 'source/blender/gpu') diff --git a/source/blender/gpu/GPU_batch_presets.h b/source/blender/gpu/GPU_batch_presets.h index 30b1574e19c..ce333f8980a 100644 --- a/source/blender/gpu/GPU_batch_presets.h +++ b/source/blender/gpu/GPU_batch_presets.h @@ -34,8 +34,8 @@ #ifndef __GPU_BATCH_PRESETS_H__ #define __GPU_BATCH_PRESETS_H__ -struct rctf; struct GPUVertFormat; +struct rctf; #include "BLI_compiler_attrs.h" #include "BLI_sys_types.h" diff --git a/source/blender/gpu/GPU_draw.h b/source/blender/gpu/GPU_draw.h index 4b94b79022b..17fbebdcfc9 100644 --- a/source/blender/gpu/GPU_draw.h +++ b/source/blender/gpu/GPU_draw.h @@ -36,17 +36,17 @@ extern "C" { #endif +struct DupliObject; struct ImBuf; struct Image; struct ImageUser; struct Main; struct Object; -struct Scene; -struct ViewLayer; -struct View3D; struct RegionView3D; +struct Scene; struct SmokeModifierData; -struct DupliObject; +struct View3D; +struct ViewLayer; #include "DNA_object_enums.h" diff --git a/source/blender/gpu/GPU_material.h b/source/blender/gpu/GPU_material.h index fee5b820256..58dec24bea8 100644 --- a/source/blender/gpu/GPU_material.h +++ b/source/blender/gpu/GPU_material.h @@ -41,28 +41,28 @@ extern "C" { #endif +struct GPUMaterial; +struct GPUNode; +struct GPUNodeLink; +struct GPUNodeStack; +struct GPUTexture; +struct GPUUniformBuffer; +struct GPUVertexAttribs; struct Image; struct ImageUser; struct ListBase; struct Main; struct Material; struct Object; -struct Scene; -struct GPUVertexAttribs; -struct GPUNode; -struct GPUNodeLink; -struct GPUNodeStack; -struct GPUMaterial; -struct GPUTexture; -struct GPUUniformBuffer; struct PreviewImage; +struct Scene; struct World; struct bNode; struct bNodeTree; +typedef struct GPUMaterial GPUMaterial; typedef struct GPUNode GPUNode; typedef struct GPUNodeLink GPUNodeLink; -typedef struct GPUMaterial GPUMaterial; typedef struct GPUParticleInfo GPUParticleInfo; diff --git a/source/blender/gpu/GPU_texture.h b/source/blender/gpu/GPU_texture.h index 828673390a4..e8cc35a128a 100644 --- a/source/blender/gpu/GPU_texture.h +++ b/source/blender/gpu/GPU_texture.h @@ -38,10 +38,10 @@ extern "C" { #endif +struct GPUVertBuf; struct Image; struct ImageUser; struct PreviewImage; -struct GPUVertBuf; struct GPUFrameBuffer; typedef struct GPUTexture GPUTexture; diff --git a/source/blender/gpu/intern/gpu_codegen.h b/source/blender/gpu/intern/gpu_codegen.h index 93eb84b7766..2325fb564ab 100644 --- a/source/blender/gpu/intern/gpu_codegen.h +++ b/source/blender/gpu/intern/gpu_codegen.h @@ -38,11 +38,11 @@ #include "GPU_material.h" #include "GPU_glew.h" -struct ListBase; -struct GPUShader; -struct GPUOutput; struct GPUNode; +struct GPUOutput; +struct GPUShader; struct GPUVertexAttribs; +struct ListBase; struct PreviewImage; /* Pass Generation -- cgit v1.2.3