diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-10-09 03:01:50 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-10-09 03:01:50 +0300 |
commit | e7218e7049972053140d94410aea75e0c3e87c61 (patch) | |
tree | 6c73c7d89ccf52cdbce88ec83f0b2052a1038f45 /source/blender/draw/intern | |
parent | 9b49a0d971c50d3316b8b752e6a9f35f67fd53c8 (diff) |
Cleanup: naming
- immAttrib* -> immAttr*
- immSkipAttrib -> immAttrSkip
Term 'attr' is a convention for GPU module.
Diffstat (limited to 'source/blender/draw/intern')
-rw-r--r-- | source/blender/draw/intern/draw_debug.c | 4 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_manager.c | 14 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_view.c | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/draw/intern/draw_debug.c b/source/blender/draw/intern/draw_debug.c index 053d266ec34..366da92cf50 100644 --- a/source/blender/draw/intern/draw_debug.c +++ b/source/blender/draw/intern/draw_debug.c @@ -161,10 +161,10 @@ static void drw_debug_draw_lines(void) while (DST.debug.lines) { void *next = DST.debug.lines->next; - immAttrib4fv(col, DST.debug.lines->color); + immAttr4fv(col, DST.debug.lines->color); immVertex3fv(pos, DST.debug.lines->pos[0]); - immAttrib4fv(col, DST.debug.lines->color); + immAttr4fv(col, DST.debug.lines->color); immVertex3fv(pos, DST.debug.lines->pos[1]); MEM_freeN(DST.debug.lines); diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index f987220e575..163b89e9152 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -270,13 +270,13 @@ void DRW_transform_to_display(GPUTexture *tex, bool use_view_settings) /* Full screen triangle */ immBegin(GPU_PRIM_TRIS, 3); - immAttrib2f(texco, 0.0f, 0.0f); + immAttr2f(texco, 0.0f, 0.0f); immVertex2f(pos, -1.0f, -1.0f); - immAttrib2f(texco, 2.0f, 0.0f); + immAttr2f(texco, 2.0f, 0.0f); immVertex2f(pos, 3.0f, -1.0f); - immAttrib2f(texco, 0.0f, 2.0f); + immAttr2f(texco, 0.0f, 2.0f); immVertex2f(pos, -1.0f, 3.0f); immEnd(); @@ -2201,16 +2201,16 @@ static void draw_depth_texture_to_screen(GPUTexture *texture) immBegin(GPU_PRIM_TRI_STRIP, 4); - immAttrib2f(texcoord, 0.0f, 0.0f); + immAttr2f(texcoord, 0.0f, 0.0f); immVertex2f(pos, 0.0f, 0.0f); - immAttrib2f(texcoord, 1.0f, 0.0f); + immAttr2f(texcoord, 1.0f, 0.0f); immVertex2f(pos, w, 0.0f); - immAttrib2f(texcoord, 0.0f, 1.0f); + immAttr2f(texcoord, 0.0f, 1.0f); immVertex2f(pos, 0.0f, h); - immAttrib2f(texcoord, 1.0f, 1.0f); + immAttr2f(texcoord, 1.0f, 1.0f); immVertex2f(pos, w, h); immEnd(); diff --git a/source/blender/draw/intern/draw_view.c b/source/blender/draw/intern/draw_view.c index d77620bc47b..545c4af878c 100644 --- a/source/blender/draw/intern/draw_view.c +++ b/source/blender/draw/intern/draw_view.c @@ -108,11 +108,11 @@ void DRW_draw_background(void) UI_GetThemeColor3ubv(TH_HIGH_GRAD, col_hi); immBegin(GPU_PRIM_TRI_FAN, 4); - immAttrib3ubv(color, col_lo); + immAttr3ubv(color, col_lo); immVertex2f(pos, -1.0f, -1.0f); immVertex2f(pos, 1.0f, -1.0f); - immAttrib3ubv(color, col_hi); + immAttr3ubv(color, col_hi); immVertex2f(pos, 1.0f, 1.0f); immVertex2f(pos, -1.0f, 1.0f); immEnd(); |