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/draw/intern/draw_manager.h | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'source/blender/draw/intern/draw_manager.h') diff --git a/source/blender/draw/intern/draw_manager.h b/source/blender/draw/intern/draw_manager.h index 8882421958b..6ff56728dbe 100644 --- a/source/blender/draw/intern/draw_manager.h +++ b/source/blender/draw/intern/draw_manager.h @@ -135,11 +135,16 @@ typedef struct DRWCallState { } DRWCallState; typedef enum { - DRW_CALL_SINGLE, /* A single batch */ - DRW_CALL_RANGE, /* Like single but only draw a range of vertices/indices. */ - DRW_CALL_INSTANCES, /* Draw instances without any instancing attribs. */ - DRW_CALL_GENERATE, /* Uses a callback to draw with any number of batches. */ - DRW_CALL_PROCEDURAL, /* Generate a drawcall without any GPUBatch. */ + /** A single batch. */ + DRW_CALL_SINGLE, + /** Like single but only draw a range of vertices/indices. */ + DRW_CALL_RANGE, + /** Draw instances without any instancing attributes. */ + DRW_CALL_INSTANCES, + /** Uses a callback to draw with any number of batches. */ + DRW_CALL_GENERATE, + /** Generate a drawcall without any #GPUBatch. */ + DRW_CALL_PROCEDURAL, } DRWCallType; typedef struct DRWCall { @@ -268,7 +273,7 @@ struct DRWShadingGroup { DRWPass *pass_parent; /* backlink to pass we're in */ #ifndef NDEBUG - char attribs_count; + char attrs_count; #endif #ifdef USE_GPU_SELECT GPUVertBuf *inst_selectid; -- cgit v1.2.3