diff options
Diffstat (limited to 'source/blender/gpu/GPU_material.h')
| -rw-r--r-- | source/blender/gpu/GPU_material.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/source/blender/gpu/GPU_material.h b/source/blender/gpu/GPU_material.h index 02a2c3c7bf4..1d50c0586a0 100644 --- a/source/blender/gpu/GPU_material.h +++ b/source/blender/gpu/GPU_material.h @@ -1,4 +1,4 @@ -/** +/* * $Id$ * * ***** BEGIN GPL LICENSE BLOCK ***** @@ -30,6 +30,10 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file GPU_material.h + * \ingroup gpu + */ + #ifndef __GPU_MATERIAL__ #define __GPU_MATERIAL__ @@ -93,7 +97,7 @@ typedef enum GPUBlendMode { typedef struct GPUNodeStack { GPUType type; - char *name; + const char *name; float vec[4]; struct GPUNodeLink *link; short hasinput; @@ -101,7 +105,7 @@ typedef struct GPUNodeStack { short sockettype; } GPUNodeStack; -GPUNodeLink *GPU_attribute(int type, char *name); +GPUNodeLink *GPU_attribute(int type, const char *name); GPUNodeLink *GPU_uniform(float *num); GPUNodeLink *GPU_dynamic_uniform(float *num); GPUNodeLink *GPU_image(struct Image *ima, struct ImageUser *iuser); @@ -110,8 +114,8 @@ GPUNodeLink *GPU_dynamic_texture(struct GPUTexture *tex); GPUNodeLink *GPU_socket(GPUNodeStack *sock); GPUNodeLink *GPU_builtin(GPUBuiltin builtin); -int GPU_link(GPUMaterial *mat, char *name, ...); -int GPU_stack_link(GPUMaterial *mat, char *name, GPUNodeStack *in, GPUNodeStack *out, ...); +int GPU_link(GPUMaterial *mat, const char *name, ...); +int GPU_stack_link(GPUMaterial *mat, const char *name, GPUNodeStack *in, GPUNodeStack *out, ...); void GPU_material_output_link(GPUMaterial *material, GPUNodeLink *link); void GPU_material_enable_alpha(GPUMaterial *material); @@ -122,7 +126,7 @@ GPUBlendMode GPU_material_blend_mode(GPUMaterial *material, float obcol[4]); GPUMaterial *GPU_material_from_blender(struct Scene *scene, struct Material *ma); void GPU_material_free(struct Material *ma); -void GPU_materials_free(); +void GPU_materials_free(void); void GPU_material_bind(GPUMaterial *material, int oblay, int viewlay, double time, int mipmap); void GPU_material_bind_uniforms(GPUMaterial *material, float obmat[][4], float viewmat[][4], float viewinv[][4], float obcol[4]); |