From 68cab3aff63aea95830aa082a160200768d0e826 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 29 Jan 2019 07:46:25 +1100 Subject: Cleanup: replace attrib w/ attr Also rename GPUVertexAttribs to GPUVertAttrLayers, avoids confusion with GPUVertAttr which isn't closely related. --- source/blender/gpu/GPU_material.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 58dec24bea8..db88e659ea1 100644 --- a/source/blender/gpu/GPU_material.h +++ b/source/blender/gpu/GPU_material.h @@ -47,7 +47,7 @@ struct GPUNodeLink; struct GPUNodeStack; struct GPUTexture; struct GPUUniformBuffer; -struct GPUVertexAttribs; +struct GPUVertAttrLayers; struct Image; struct ImageUser; struct ListBase; @@ -90,7 +90,7 @@ typedef enum eGPUType { GPU_CLOSURE = 1006, /* Opengl Attributes */ - GPU_ATTRIB = 3001, + GPU_ATTR = 3001, } eGPUType; typedef enum eGPUBuiltin { @@ -189,9 +189,9 @@ 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_attributes( +void GPU_material_vertex_attrs( GPUMaterial *material, - struct GPUVertexAttribs *attrib); + struct GPUVertAttrLayers *attrs); bool GPU_material_do_color_management(GPUMaterial *mat); bool GPU_material_use_domain_surface(GPUMaterial *mat); -- cgit v1.2.3