diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-11 08:48:52 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-11 08:48:52 +0300 |
| commit | 33f3298e28d8d16e870c7a6cb8ca0fef756335a2 (patch) | |
| tree | 4786bbb15913e2651a4406305812e3b90b607fe1 /source/blender/draw/intern/draw_instance_data.c | |
| parent | df10a2e030583ff9b2210e74ac262ec05d0684ae (diff) | |
Cleanup: use 'uint' in draw manager
Diffstat (limited to 'source/blender/draw/intern/draw_instance_data.c')
| -rw-r--r-- | source/blender/draw/intern/draw_instance_data.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/draw/intern/draw_instance_data.c b/source/blender/draw/intern/draw_instance_data.c index 350d4a0c20d..6aa8da3badb 100644 --- a/source/blender/draw/intern/draw_instance_data.c +++ b/source/blender/draw/intern/draw_instance_data.c @@ -217,10 +217,10 @@ void DRW_instance_buffer_finish(DRWInstanceDataList *idatalist) for (int i = 0; i < batching->alloc_size; i++, bbuf++) { if (bbuf->shgroup != NULL) { realloc_size = i + 1; - unsigned int vert_ct = DRW_shgroup_get_instance_count(bbuf->shgroup); + uint vert_ct = DRW_shgroup_get_instance_count(bbuf->shgroup); vert_ct += (vert_ct == 0) ? 1 : 0; /* Do not realloc to 0 size buffer */ if (vert_ct + BUFFER_VERTS_CHUNK <= bbuf->vert->vertex_ct) { - unsigned int size = vert_ct + BUFFER_VERTS_CHUNK - 1; + uint size = vert_ct + BUFFER_VERTS_CHUNK - 1; size = size - size % BUFFER_VERTS_CHUNK; GWN_vertbuf_data_resize(bbuf->vert, size); } @@ -249,10 +249,10 @@ void DRW_instance_buffer_finish(DRWInstanceDataList *idatalist) for (int i = 0; i < instancing->alloc_size; i++, ibuf++) { if (ibuf->shgroup != NULL) { realloc_size = i + 1; - unsigned int vert_ct = DRW_shgroup_get_instance_count(ibuf->shgroup); + uint vert_ct = DRW_shgroup_get_instance_count(ibuf->shgroup); vert_ct += (vert_ct == 0) ? 1 : 0; /* Do not realloc to 0 size buffer */ if (vert_ct + BUFFER_VERTS_CHUNK <= ibuf->vert->vertex_ct) { - unsigned int size = vert_ct + BUFFER_VERTS_CHUNK - 1; + uint size = vert_ct + BUFFER_VERTS_CHUNK - 1; size = size - size % BUFFER_VERTS_CHUNK; GWN_vertbuf_data_resize(ibuf->vert, size); } @@ -283,7 +283,7 @@ void DRW_instance_buffer_finish(DRWInstanceDataList *idatalist) * \{ */ static DRWInstanceData *drw_instance_data_create( - DRWInstanceDataList *idatalist, unsigned int attrib_size, unsigned int instance_group) + DRWInstanceDataList *idatalist, uint attrib_size, uint instance_group) { DRWInstanceData *idata = MEM_callocN(sizeof(DRWInstanceData), "DRWInstanceData"); idata->next = NULL; @@ -338,7 +338,7 @@ void *DRW_instance_data_get(DRWInstanceData *idata) } DRWInstanceData *DRW_instance_data_request( - DRWInstanceDataList *idatalist, unsigned int attrib_size, unsigned int instance_group) + DRWInstanceDataList *idatalist, uint attrib_size, uint instance_group) { BLI_assert(attrib_size > 0 && attrib_size <= MAX_INSTANCE_DATA_SIZE); |