diff options
Diffstat (limited to 'source/blender/draw/intern')
| -rw-r--r-- | source/blender/draw/intern/draw_cache.c | 4 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_cache_impl_mesh.c | 2 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_hair.c | 2 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_instance_data.c | 13 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_manager.c | 6 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_manager.h | 2 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_manager_data.c | 2 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_manager_exec.c | 2 |
8 files changed, 17 insertions, 16 deletions
diff --git a/source/blender/draw/intern/draw_cache.c b/source/blender/draw/intern/draw_cache.c index 0f79affe44a..482cc047bbc 100644 --- a/source/blender/draw/intern/draw_cache.c +++ b/source/blender/draw/intern/draw_cache.c @@ -2009,7 +2009,7 @@ static const uint bone_octahedral_solid_tris[8][3] = { * According to opengl specification it becomes (starting from * the first vertex of the first face aka. vertex 2): * {0, 12, 1, 10, 2, 3} - **/ + */ static const uint bone_octahedral_wire_lines_adjacency[12][4] = { { 0, 1, 2, 6}, { 0, 12, 1, 6}, { 0, 3, 12, 6}, { 0, 2, 3, 6}, { 1, 6, 2, 3}, { 1, 12, 6, 3}, { 1, 0, 12, 3}, { 1, 2, 0, 3}, @@ -2161,7 +2161,7 @@ static const uint bone_box_solid_tris[12][3] = { /** * Store indices of generated verts from bone_box_solid_tris to define adjacency infos. * See bone_octahedral_solid_tris for more infos. - **/ + */ static const uint bone_box_wire_lines_adjacency[12][4] = { { 4, 2, 0, 11}, { 0, 1, 2, 8}, { 2, 4, 1, 14}, { 1, 0, 4, 20}, /* bottom */ { 0, 8, 11, 14}, { 2, 14, 8, 20}, { 1, 20, 14, 11}, { 4, 11, 20, 8}, /* top */ diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c index 7c1ef09aaa7..08b306b0ebe 100644 --- a/source/blender/draw/intern/draw_cache_impl_mesh.c +++ b/source/blender/draw/intern/draw_cache_impl_mesh.c @@ -4885,7 +4885,7 @@ void DRW_mesh_batch_cache_create_requested( * TODO: The code and data structure is ready to support modified UV display * but the selection code for UVs needs to support it first. So for now, only * display the cage in all cases. - **/ + */ if (rdata && rdata->mapped.supported) { rdata->mapped.use = false; } diff --git a/source/blender/draw/intern/draw_hair.c b/source/blender/draw/intern/draw_hair.c index 09d0fa06f22..bbe5b4cf41e 100644 --- a/source/blender/draw/intern/draw_hair.c +++ b/source/blender/draw/intern/draw_hair.c @@ -246,7 +246,7 @@ void DRW_hair_update(void) * readback the result to system memory and reupload as VBO data. * It is really not ideal performance wise, but it is the simplest * and the most local workaround that still uses the power of the GPU. - **/ + */ if (g_tf_calls == NULL) { return; diff --git a/source/blender/draw/intern/draw_instance_data.c b/source/blender/draw/intern/draw_instance_data.c index 119ac7c2609..718518643e0 100644 --- a/source/blender/draw/intern/draw_instance_data.c +++ b/source/blender/draw/intern/draw_instance_data.c @@ -24,10 +24,10 @@ * DRW Instance Data Manager * This is a special memory manager that keeps memory blocks ready to send as vbo data in one continuous allocation. * This way we avoid feeding gawain each instance data one by one and unnecessary memcpy. - * Since we loose which memory block was used each DRWShadingGroup we need to redistribute them in the same order/size + * Since we loose which memory block was used each #DRWShadingGroup we need to redistribute them in the same order/size * to avoid to realloc each frame. - * This is why DRWInstanceDatas are sorted in a list for each different data size. - **/ + * This is why #DRWInstanceDatas are sorted in a list for each different data size. + */ #include "draw_instance_data.h" #include "DRW_engine.h" @@ -94,15 +94,14 @@ static ListBase g_idatalists = {NULL, NULL}; * be static so that it's pointer never changes (because we are using * this pointer as identifier [we don't want to check the full format * that would be too slow]). - **/ - + */ static void instance_batch_free(GPUBatch *batch, void *UNUSED(user_data)) { if (batch->verts[0] == NULL) { /** XXX This is a false positive case. * The batch has been requested but not init yet * and there is a chance that it might become init. - **/ + */ return; } /* Free all batches that have the same key before they are reused. */ @@ -313,7 +312,7 @@ static void DRW_instance_data_free(DRWInstanceData *idata) /** * Return a pointer to the next instance data space. - **/ + */ void *DRW_instance_data_next(DRWInstanceData *idata) { return BLI_mempool_alloc(idata->mempool); diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index e991c69fdc1..e517b6f8e45 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -375,9 +375,11 @@ void DRW_transform_none(GPUTexture *tex) /** \name Multisample Resolve * \{ */ -/* Use manual multisample resolve pass. +/** + * Use manual multisample resolve pass. * Much quicker than blitting back and forth. - * Assume destination fb is bound*/ + * Assume destination fb is bound. + */ void DRW_multisamples_resolve(GPUTexture *src_depth, GPUTexture *src_color, bool use_depth) { DRWState state = DRW_STATE_WRITE_COLOR | DRW_STATE_BLEND_PREMUL; diff --git a/source/blender/draw/intern/draw_manager.h b/source/blender/draw/intern/draw_manager.h index 22dfc28e305..25dbe776858 100644 --- a/source/blender/draw/intern/draw_manager.h +++ b/source/blender/draw/intern/draw_manager.h @@ -83,7 +83,7 @@ * Data structure containing all drawcalls organized by passes and materials. * DRWPass > DRWShadingGroup > DRWCall > DRWCallState * > DRWUniform - **/ + */ /* Used by DRWCallState.flag */ enum { diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c index 6f9e2cff36c..c11c183e0f5 100644 --- a/source/blender/draw/intern/draw_manager_data.c +++ b/source/blender/draw/intern/draw_manager_data.c @@ -1217,7 +1217,7 @@ static int pass_shgroup_dist_sort(void *thunk, const void *a, const void *b) /** * Sort Shading groups by decreasing Z of their first draw call. * This is useful for order dependent effect such as transparency. - **/ + */ void DRW_pass_sort_shgroup_z(DRWPass *pass) { float (*viewinv)[4]; diff --git a/source/blender/draw/intern/draw_manager_exec.c b/source/blender/draw/intern/draw_manager_exec.c index 8e04b9eddfd..89dcb01fc9c 100644 --- a/source/blender/draw/intern/draw_manager_exec.c +++ b/source/blender/draw/intern/draw_manager_exec.c @@ -426,7 +426,7 @@ void DRW_state_invert_facing(void) * This only works if DRWPasses have been tagged with DRW_STATE_CLIP_PLANES, * and if the shaders have support for it (see usage of gl_ClipDistance). * Be sure to call DRW_state_clip_planes_reset() after you finish drawing. - **/ + */ void DRW_state_clip_planes_len_set(uint plane_len) { BLI_assert(plane_len <= MAX_CLIP_PLANES); |