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_shader_interface.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'source/blender/gpu/GPU_shader_interface.h') diff --git a/source/blender/gpu/GPU_shader_interface.h b/source/blender/gpu/GPU_shader_interface.h index 0559a72e52c..8d94c07a019 100644 --- a/source/blender/gpu/GPU_shader_interface.h +++ b/source/blender/gpu/GPU_shader_interface.h @@ -69,9 +69,12 @@ typedef struct GPUShaderInput { struct GPUShaderInput *next; uint32_t name_offset; uint name_hash; - GPUUniformBuiltin builtin_type; /* only for uniform inputs */ - uint32_t gl_type; /* only for attrib inputs */ - int32_t size; /* only for attrib inputs */ + /** Only for uniform inputs. */ + GPUUniformBuiltin builtin_type; + /** Only for attribute inputs. */ + uint32_t gl_type; + /** Only for attribute inputs. */ + int32_t size; int32_t location; } GPUShaderInput; @@ -81,7 +84,7 @@ typedef struct GPUShaderInput { typedef struct GPUShaderInterface { int32_t program; uint32_t name_buffer_offset; - GPUShaderInput *attrib_buckets[GPU_NUM_SHADERINTERFACE_BUCKETS]; + GPUShaderInput *attr_buckets[GPU_NUM_SHADERINTERFACE_BUCKETS]; GPUShaderInput *uniform_buckets[GPU_NUM_SHADERINTERFACE_BUCKETS]; GPUShaderInput *ubo_buckets[GPU_NUM_SHADERINTERFACE_BUCKETS]; GPUShaderInput *builtin_uniforms[GPU_NUM_UNIFORMS]; -- cgit v1.2.3