From e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Apr 2019 06:17:24 +0200 Subject: ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat --- source/blender/gpu/GPU_material.h | 174 +++++++++++++++++++++----------------- 1 file changed, 95 insertions(+), 79 deletions(-) (limited to 'source/blender/gpu/GPU_material.h') diff --git a/source/blender/gpu/GPU_material.h b/source/blender/gpu/GPU_material.h index 6d8319fbdd3..da61dc76422 100644 --- a/source/blender/gpu/GPU_material.h +++ b/source/blender/gpu/GPU_material.h @@ -61,85 +61,85 @@ typedef struct GPUParticleInfo GPUParticleInfo; /* Functions to create GPU Materials nodes */ typedef enum eGPUType { - /* Keep in sync with GPU_DATATYPE_STR */ - /* The value indicates the number of elements in each type */ - GPU_NONE = 0, - GPU_FLOAT = 1, - GPU_VEC2 = 2, - GPU_VEC3 = 3, - GPU_VEC4 = 4, - GPU_MAT3 = 9, - GPU_MAT4 = 16, - - /* Values not in GPU_DATATYPE_STR */ - GPU_TEX1D_ARRAY = 1001, - GPU_TEX2D = 1002, - GPU_TEX3D = 1003, - GPU_SHADOW2D = 1004, - GPU_TEXCUBE = 1005, - - /* GLSL Struct types */ - GPU_CLOSURE = 1006, - - /* Opengl Attributes */ - GPU_ATTR = 3001, + /* Keep in sync with GPU_DATATYPE_STR */ + /* The value indicates the number of elements in each type */ + GPU_NONE = 0, + GPU_FLOAT = 1, + GPU_VEC2 = 2, + GPU_VEC3 = 3, + GPU_VEC4 = 4, + GPU_MAT3 = 9, + GPU_MAT4 = 16, + + /* Values not in GPU_DATATYPE_STR */ + GPU_TEX1D_ARRAY = 1001, + GPU_TEX2D = 1002, + GPU_TEX3D = 1003, + GPU_SHADOW2D = 1004, + GPU_TEXCUBE = 1005, + + /* GLSL Struct types */ + GPU_CLOSURE = 1006, + + /* Opengl Attributes */ + GPU_ATTR = 3001, } eGPUType; typedef enum eGPUBuiltin { - GPU_VIEW_MATRIX = (1 << 0), - GPU_OBJECT_MATRIX = (1 << 1), - GPU_INVERSE_VIEW_MATRIX = (1 << 2), - GPU_INVERSE_OBJECT_MATRIX = (1 << 3), - GPU_VIEW_POSITION = (1 << 4), - GPU_VIEW_NORMAL = (1 << 5), - GPU_OBCOLOR = (1 << 6), - GPU_AUTO_BUMPSCALE = (1 << 7), - GPU_CAMERA_TEXCO_FACTORS = (1 << 8), - GPU_PARTICLE_SCALAR_PROPS = (1 << 9), - GPU_PARTICLE_LOCATION = (1 << 10), - GPU_PARTICLE_VELOCITY = (1 << 11), - GPU_PARTICLE_ANG_VELOCITY = (1 << 12), - GPU_LOC_TO_VIEW_MATRIX = (1 << 13), - GPU_INVERSE_LOC_TO_VIEW_MATRIX = (1 << 14), - GPU_OBJECT_INFO = (1 << 15), - GPU_VOLUME_DENSITY = (1 << 16), - GPU_VOLUME_FLAME = (1 << 17), - GPU_VOLUME_TEMPERATURE = (1 << 18), - GPU_BARYCENTRIC_TEXCO = (1 << 19), - GPU_BARYCENTRIC_DIST = (1 << 20), - GPU_INVERSE_NORMAL_MATRIX = (1 << 21), + GPU_VIEW_MATRIX = (1 << 0), + GPU_OBJECT_MATRIX = (1 << 1), + GPU_INVERSE_VIEW_MATRIX = (1 << 2), + GPU_INVERSE_OBJECT_MATRIX = (1 << 3), + GPU_VIEW_POSITION = (1 << 4), + GPU_VIEW_NORMAL = (1 << 5), + GPU_OBCOLOR = (1 << 6), + GPU_AUTO_BUMPSCALE = (1 << 7), + GPU_CAMERA_TEXCO_FACTORS = (1 << 8), + GPU_PARTICLE_SCALAR_PROPS = (1 << 9), + GPU_PARTICLE_LOCATION = (1 << 10), + GPU_PARTICLE_VELOCITY = (1 << 11), + GPU_PARTICLE_ANG_VELOCITY = (1 << 12), + GPU_LOC_TO_VIEW_MATRIX = (1 << 13), + GPU_INVERSE_LOC_TO_VIEW_MATRIX = (1 << 14), + GPU_OBJECT_INFO = (1 << 15), + GPU_VOLUME_DENSITY = (1 << 16), + GPU_VOLUME_FLAME = (1 << 17), + GPU_VOLUME_TEMPERATURE = (1 << 18), + GPU_BARYCENTRIC_TEXCO = (1 << 19), + GPU_BARYCENTRIC_DIST = (1 << 20), + GPU_INVERSE_NORMAL_MATRIX = (1 << 21), } eGPUBuiltin; typedef enum eGPUMatFlag { - GPU_MATFLAG_DIFFUSE = (1 << 0), - GPU_MATFLAG_GLOSSY = (1 << 1), - GPU_MATFLAG_REFRACT = (1 << 2), - GPU_MATFLAG_SSS = (1 << 3), + GPU_MATFLAG_DIFFUSE = (1 << 0), + GPU_MATFLAG_GLOSSY = (1 << 1), + GPU_MATFLAG_REFRACT = (1 << 2), + GPU_MATFLAG_SSS = (1 << 3), } eGPUMatFlag; typedef enum eGPUBlendMode { - GPU_BLEND_SOLID = 0, - GPU_BLEND_ADD = 1, - GPU_BLEND_ALPHA = 2, - GPU_BLEND_CLIP = 4, - GPU_BLEND_ALPHA_SORT = 8, - GPU_BLEND_ALPHA_TO_COVERAGE = 16, + GPU_BLEND_SOLID = 0, + GPU_BLEND_ADD = 1, + GPU_BLEND_ALPHA = 2, + GPU_BLEND_CLIP = 4, + GPU_BLEND_ALPHA_SORT = 8, + GPU_BLEND_ALPHA_TO_COVERAGE = 16, } eGPUBlendMode; typedef struct GPUNodeStack { - eGPUType type; - float vec[4]; - struct GPUNodeLink *link; - bool hasinput; - bool hasoutput; - short sockettype; - bool end; + eGPUType type; + float vec[4]; + struct GPUNodeLink *link; + bool hasinput; + bool hasoutput; + short sockettype; + bool end; } GPUNodeStack; typedef enum eGPUMaterialStatus { - GPU_MAT_FAILED = 0, - GPU_MAT_QUEUED, - GPU_MAT_SUCCESS, + GPU_MAT_FAILED = 0, + GPU_MAT_QUEUED, + GPU_MAT_SUCCESS, } eGPUMaterialStatus; GPUNodeLink *GPU_attribute(CustomDataType type, const char *name); @@ -150,24 +150,42 @@ GPUNodeLink *GPU_color_band(GPUMaterial *mat, int size, float *pixels, float *la GPUNodeLink *GPU_builtin(eGPUBuiltin builtin); bool GPU_link(GPUMaterial *mat, const char *name, ...); -bool GPU_stack_link(GPUMaterial *mat, struct bNode *node, const char *name, GPUNodeStack *in, GPUNodeStack *out, ...); -GPUNodeLink *GPU_uniformbuffer_link_out( - struct GPUMaterial *mat, struct bNode *node, - struct GPUNodeStack *stack, const int index); +bool GPU_stack_link(GPUMaterial *mat, + struct bNode *node, + const char *name, + GPUNodeStack *in, + GPUNodeStack *out, + ...); +GPUNodeLink *GPU_uniformbuffer_link_out(struct GPUMaterial *mat, + struct bNode *node, + struct GPUNodeStack *stack, + const int index); void GPU_material_output_link(GPUMaterial *material, GPUNodeLink *link); eGPUBuiltin GPU_get_material_builtins(GPUMaterial *material); -void GPU_material_sss_profile_create(GPUMaterial *material, float radii[3], short *falloff_type, float *sharpness); -struct GPUUniformBuffer *GPU_material_sss_profile_get( - GPUMaterial *material, int sample_len, struct GPUTexture **tex_profile); +void GPU_material_sss_profile_create(GPUMaterial *material, + float radii[3], + short *falloff_type, + float *sharpness); +struct GPUUniformBuffer *GPU_material_sss_profile_get(GPUMaterial *material, + int sample_len, + struct GPUTexture **tex_profile); /* High level functions to create and use GPU materials */ -GPUMaterial *GPU_material_from_nodetree_find( - struct ListBase *gpumaterials, const void *engine_type, int options); -GPUMaterial *GPU_material_from_nodetree( - struct Scene *scene, struct bNodeTree *ntree, struct ListBase *gpumaterials, const void *engine_type, int options, - const char *vert_code, const char *geom_code, const char *frag_lib, const char *defines, const char *name); +GPUMaterial *GPU_material_from_nodetree_find(struct ListBase *gpumaterials, + const void *engine_type, + int options); +GPUMaterial *GPU_material_from_nodetree(struct Scene *scene, + struct bNodeTree *ntree, + struct ListBase *gpumaterials, + const void *engine_type, + int options, + const char *vert_code, + const char *geom_code, + const char *frag_lib, + const char *defines, + const char *name); void GPU_material_compile(GPUMaterial *mat); void GPU_material_free(struct ListBase *gpumaterial); @@ -182,9 +200,7 @@ struct GPUUniformBuffer *GPU_material_uniform_buffer_get(GPUMaterial *material); void GPU_material_uniform_buffer_create(GPUMaterial *material, ListBase *inputs); struct GPUUniformBuffer *GPU_material_create_sss_profile_ubo(void); -void GPU_material_vertex_attrs( - GPUMaterial *material, - struct GPUVertAttrLayers *attrs); +void GPU_material_vertex_attrs(GPUMaterial *material, struct GPUVertAttrLayers *attrs); bool GPU_material_do_color_management(GPUMaterial *mat); bool GPU_material_use_domain_surface(GPUMaterial *mat); -- cgit v1.2.3