diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-01-22 04:09:27 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-01-22 04:09:27 +0300 |
| commit | 7f40d553f90358c5383100f4f5b5e2410dcd7369 (patch) | |
| tree | dab3bd1aa664ea46101fa0e68de171e92fb0ff53 /source/blender/draw/modes/paint_vertex_mode.c | |
| parent | c7768bcf4b116aa515890feed2f3019a2d9c55f4 (diff) | |
Cleanp: use single global for draw manager
Add 'G_draw' for all draw manager globals,
avoids adding extern to each file.
Connection between `ts` and `globals_ubo` wasn't obvious,
now called `G_draw.block` & `G_draw.block_ubo`.
Diffstat (limited to 'source/blender/draw/modes/paint_vertex_mode.c')
| -rw-r--r-- | source/blender/draw/modes/paint_vertex_mode.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/draw/modes/paint_vertex_mode.c b/source/blender/draw/modes/paint_vertex_mode.c index db3cd463d65..658631ea1ed 100644 --- a/source/blender/draw/modes/paint_vertex_mode.c +++ b/source/blender/draw/modes/paint_vertex_mode.c @@ -38,9 +38,6 @@ #include "DEG_depsgraph_query.h" -extern struct GPUUniformBuffer *globals_ubo; /* draw_common.c */ -extern struct GlobalsUboStorage ts; /* draw_common.c */ - extern char datatoc_paint_vertex_vert_glsl[]; extern char datatoc_paint_vertex_frag_glsl[]; extern char datatoc_paint_wire_vert_glsl[]; @@ -141,7 +138,7 @@ static void PAINT_VERTEX_cache_init(void *vedata) DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS_EQUAL | DRW_STATE_OFFSET_NEGATIVE); stl->g_data->lwire_shgrp = DRW_shgroup_create(e_data.wire_overlay_shader, psl->wire_overlay); - DRW_shgroup_uniform_block(stl->g_data->lwire_shgrp, "globalsBlock", globals_ubo); + DRW_shgroup_uniform_block(stl->g_data->lwire_shgrp, "globalsBlock", G_draw.block_ubo); } { @@ -161,7 +158,7 @@ static void PAINT_VERTEX_cache_init(void *vedata) DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS_EQUAL | DRW_STATE_OFFSET_NEGATIVE); stl->g_data->vert_shgrp = DRW_shgroup_create(e_data.vert_overlay_shader, psl->vert_overlay); - DRW_shgroup_uniform_block(stl->g_data->vert_shgrp, "globalsBlock", globals_ubo); + DRW_shgroup_uniform_block(stl->g_data->vert_shgrp, "globalsBlock", G_draw.block_ubo); } } |